projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'gcc-plugins-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
rocker
/
rocker_main.c
diff --git
a/drivers/net/ethernet/rocker/rocker_main.c
b/drivers/net/ethernet/rocker/rocker_main.c
index
5424fb3
..
24b7464
100644
(file)
--- a/
drivers/net/ethernet/rocker/rocker_main.c
+++ b/
drivers/net/ethernet/rocker/rocker_main.c
@@
-1471,7
+1471,7
@@
static int rocker_world_check_init(struct rocker_port *rocker_port)
if (rocker->wops) {
if (rocker->wops->mode != mode) {
dev_err(&rocker->pdev->dev, "hardware has ports in different worlds, which is not supported\n");
- return
err
;
+ return
-EINVAL
;
}
return 0;
}