Commit 643e6dae authored by Govindarajulu Varadarajan's avatar Govindarajulu Varadarajan Committed by Marcelo Henrique Cerri

enic: do not overwrite error code

BugLink: https://bugs.launchpad.net/bugs/1881356

commit 56f77227 upstream.

In failure path, we overwrite err to what vnic_rq_disable() returns. In
case it returns 0, enic_open() returns success in case of error.
Reported-by: default avatarBen Hutchings <ben.hutchings@codethink.co.uk>
Fixes: e8588e26 ("enic: enable rq before updating rq descriptors")
Signed-off-by: default avatarGovindarajulu Varadarajan <gvaradar@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarIan May <ian.may@canonical.com>
Signed-off-by: default avatarKelsey Skunberg <kelsey.skunberg@canonical.com>
parent d6ca4670
...@@ -1708,7 +1708,7 @@ static int enic_open(struct net_device *netdev) ...@@ -1708,7 +1708,7 @@ static int enic_open(struct net_device *netdev)
{ {
struct enic *enic = netdev_priv(netdev); struct enic *enic = netdev_priv(netdev);
unsigned int i; unsigned int i;
int err; int err, ret;
err = enic_request_intr(enic); err = enic_request_intr(enic);
if (err) { if (err) {
...@@ -1766,10 +1766,9 @@ static int enic_open(struct net_device *netdev) ...@@ -1766,10 +1766,9 @@ static int enic_open(struct net_device *netdev)
err_out_free_rq: err_out_free_rq:
for (i = 0; i < enic->rq_count; i++) { for (i = 0; i < enic->rq_count; i++) {
err = vnic_rq_disable(&enic->rq[i]); ret = vnic_rq_disable(&enic->rq[i]);
if (err) if (!ret)
return err; vnic_rq_clean(&enic->rq[i], enic_free_rq_buf);
vnic_rq_clean(&enic->rq[i], enic_free_rq_buf);
} }
enic_dev_notify_unset(enic); enic_dev_notify_unset(enic);
err_out_free_intr: err_out_free_intr:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment