mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
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: 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:
parent
8c43bd1706
commit
56f772279a
1 changed files with 4 additions and 5 deletions
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue