From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kulikov Vasiliy Subject: [PATCH] 3c59x: handle pci_iomap() errors Date: Wed, 21 Jul 2010 16:00:36 +0400 Message-ID: <1279713638-31567-1-git-send-email-segooon@gmail.com> Cc: Steffen Klassert , "David S. Miller" , Eric Dumazet , Ben Hutchings , Alexey Dobriyan , Joe Perches , netdev@vger.kernel.org To: kernel-janitors@vger.kernel.org Return-path: Received: from mail-ew0-f46.google.com ([209.85.215.46]:59930 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755296Ab0GUMAp (ORCPT ); Wed, 21 Jul 2010 08:00:45 -0400 Sender: netdev-owner@vger.kernel.org List-ID: pci_iomap() can fail, handle this case and return -ENOMEM from probe function. Signed-off-by: Kulikov Vasiliy --- drivers/net/3c59x.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 069a03f..9b137e1 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c @@ -1020,6 +1020,11 @@ static int __devinit vortex_init_one(struct pci_dev *pdev, ioaddr = pci_iomap(pdev, pci_bar, 0); if (!ioaddr) /* If mapping fails, fall-back to BAR 0... */ ioaddr = pci_iomap(pdev, 0, 0); + if (!ioaddr) { + pci_disable_device(pdev); + rc = -ENOMEM; + goto out; + } rc = vortex_probe1(&pdev->dev, ioaddr, pdev->irq, ent->driver_data, unit); -- 1.7.0.4