| Message ID | 1419926626-26624-1-git-send-email-xuyongjiande@163.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
> -----Original Message----- > From: xuyongjiande@163.com [mailto:xuyongjiande@163.com] > Sent: Tuesday, December 30, 2014 1:34 PM > To: Shahed Shaikh; Dept-GE Linux NIC Dev > Cc: netdev; linux-kernel; Yongjian Xu > Subject: [PATCH] qlcnic: Fix return value in qlcnic_probe() > > From: Yongjian Xu <xuyongjiande@gmail.com> > > If the check of adapter fails and goes into the 'else' branch, the return value > 'err' should not still be zero. > > Signed-off-by: Yongjian Xu <xuyongjiande@gmail.com> > --- > drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 + > 1 file changed, 1 insertion(+) Acked-by: Shahed Shaikh <shahed.shaikh@qlogic.com> Thanks, Shahed -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: xuyongjiande@163.com Date: Tue, 30 Dec 2014 16:03:46 +0800 > From: Yongjian Xu <xuyongjiande@gmail.com> > > If the check of adapter fails and goes into the 'else' branch, the > return value 'err' should not still be zero. > > Signed-off-by: Yongjian Xu <xuyongjiande@gmail.com> Applied, thank you. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 1aa25b1..a95b604 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -2603,6 +2603,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } else { dev_err(&pdev->dev, "%s: failed. Please Reboot\n", __func__); + err = -ENODEV; goto err_out_free_hw; }