diff options
| author | Govindarajulu Varadarajan <gvaradar@cisco.com> | 2018-06-18 10:01:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-20 08:10:13 +0900 |
| commit | 56f772279a762984f6e9ebbf24a7c829faba5712 (patch) | |
| tree | f9a2fc742b0482d6acbb7828e1b8b8ec6dd7cf29 | |
| parent | 8c43bd1706885ba1acfa88da02bc60a2ec16f68c (diff) | |
| download | linux-stable-56f772279a762984f6e9ebbf24a7c829faba5712.tar.gz linux-stable-56f772279a762984f6e9ebbf24a7c829faba5712.tar.bz2 linux-stable-56f772279a762984f6e9ebbf24a7c829faba5712.zip | |
enic: do not overwrite error code
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: e8588e268509 ("enic: enable rq before updating rq descriptors")
Signed-off-by: Govindarajulu Varadarajan <gvaradar@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index e6ad581eadd8..90c645b8538e 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c @@ -1920,7 +1920,7 @@ static int enic_open(struct net_device *netdev) { struct enic *enic = netdev_priv(netdev); unsigned int i; - int err; + int err, ret; err = enic_request_intr(enic); if (err) { @@ -1977,10 +1977,9 @@ static int enic_open(struct net_device *netdev) err_out_free_rq: for (i = 0; i < enic->rq_count; i++) { - err = vnic_rq_disable(&enic->rq[i]); - if (err) - return err; - vnic_rq_clean(&enic->rq[i], enic_free_rq_buf); + ret = vnic_rq_disable(&enic->rq[i]); + if (!ret) + vnic_rq_clean(&enic->rq[i], enic_free_rq_buf); } enic_dev_notify_unset(enic); err_out_free_intr: |