xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enic: do not overwrite error code

Browse Source 
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: Ben Hutchings <ben.hutchings@codethink.co.uk>
Fixes: e8588e2685 ("enic: enable rq before updating rq descriptors")
Signed-off-by: Govindarajulu Varadarajan <gvaradar@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Govindarajulu Varadarajan
2018-06-18 10:01:05 -07:00
committed by David S. Miller
parent 8c43bd1706
commit 56f772279a
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/cisco/enic/enic_main.c
View File

@@ -1920,7 +1920,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) {
@@ -1977,9 +1977,8 @@ 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);