| Message ID | 1348680122-9711-1-git-send-email-nhorman@tuxdriver.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, 2012-09-26 at 13:22 -0400, Neil Horman wrote: > commit c0357e975afdbbedab5c662d19bef865f02adc17 modified bnx2 to switch from > using ioremap/iounmap to pci_iomap/pci_iounmap. They missed a spot in the error > path of bnx2_init_one though. This patch just cleans that up. > > Signed-off-by: Neil Horman <nhorman@tuxdriver.com> > CC: Michael Chan <mcan@broadcom.com> > CC: "David S. Miller" <davem@davemloft.net> Acked-by: Michael Chan <mchan@broadcom.com> > --- > drivers/net/ethernet/broadcom/bnx2.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c > index 79cebd8..e48312f 100644 > --- a/drivers/net/ethernet/broadcom/bnx2.c > +++ b/drivers/net/ethernet/broadcom/bnx2.c > @@ -8564,7 +8564,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) > return 0; > > error: > - iounmap(bp->regview); > + pci_iounmap(pdev, bp->regview); > pci_release_regions(pdev); > pci_disable_device(pdev); > pci_set_drvdata(pdev, NULL); -- 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: "Michael Chan" <mchan@broadcom.com> Date: Wed, 26 Sep 2012 11:33:53 -0700 > On Wed, 2012-09-26 at 13:22 -0400, Neil Horman wrote: >> commit c0357e975afdbbedab5c662d19bef865f02adc17 modified bnx2 to switch from >> using ioremap/iounmap to pci_iomap/pci_iounmap. They missed a spot in the error >> path of bnx2_init_one though. This patch just cleans that up. >> >> Signed-off-by: Neil Horman <nhorman@tuxdriver.com> >> CC: Michael Chan <mcan@broadcom.com> >> CC: "David S. Miller" <davem@davemloft.net> > > Acked-by: Michael Chan <mchan@broadcom.com> Applied, thanks. -- 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/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index 79cebd8..e48312f 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -8564,7 +8564,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) return 0; error: - iounmap(bp->regview); + pci_iounmap(pdev, bp->regview); pci_release_regions(pdev); pci_disable_device(pdev); pci_set_drvdata(pdev, NULL);
commit c0357e975afdbbedab5c662d19bef865f02adc17 modified bnx2 to switch from using ioremap/iounmap to pci_iomap/pci_iounmap. They missed a spot in the error path of bnx2_init_one though. This patch just cleans that up. Signed-off-by: Neil Horman <nhorman@tuxdriver.com> CC: Michael Chan <mcan@broadcom.com> CC: "David S. Miller" <davem@davemloft.net> --- drivers/net/ethernet/broadcom/bnx2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)