rocker: fix error return code in rocker_world_check_init()
authorWei Yongjun <weiyongjun1@huawei.com>
Sat, 22 Oct 2016 14:31:06 +0000 (14:31 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 26 Oct 2016 21:20:36 +0000 (17:20 -0400)
Fix to return error code -EINVAL from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: e420114eef4a ("rocker: introduce worlds infrastructure")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/rocker/rocker_main.c

index 5424fb341613fe578b237f3498dc83a5237b2ede..24b746406bc7a505ee08c75ef3713a0be5e6dba7 100644 (file)
@@ -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;
        }