From b993467c48ba688246a93db78d9d34d2c8c57751 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 29 Jun 2007 15:33:30 +0200 Subject: [PATCH] --- yaml --- r: 60468 b: refs/heads/master c: 777ec5e9cec521af617fc52a1c1ae24f68f4a43b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/airo.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f67d13228b28..7ed11eb7535c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a62056f0b0cfdc175afd99fef80a68f01cdf0f4b +refs/heads/master: 777ec5e9cec521af617fc52a1c1ae24f68f4a43b diff --git a/trunk/drivers/net/wireless/airo.c b/trunk/drivers/net/wireless/airo.c index 2d3a180dada0..57da70b07f1f 100644 --- a/trunk/drivers/net/wireless/airo.c +++ b/trunk/drivers/net/wireless/airo.c @@ -5597,8 +5597,10 @@ static int __devinit airo_pci_probe(struct pci_dev *pdev, dev = _init_airo_card(pdev->irq, pdev->resource[0].start, 0, pdev, &pdev->dev); else dev = _init_airo_card(pdev->irq, pdev->resource[2].start, 0, pdev, &pdev->dev); - if (!dev) + if (!dev) { + pci_disable_device(pdev); return -ENODEV; + } pci_set_drvdata(pdev, dev); return 0; @@ -5610,6 +5612,8 @@ static void __devexit airo_pci_remove(struct pci_dev *pdev) airo_print_info(dev->name, "Unregistering..."); stop_airo_card(dev, 1); + pci_disable_device(pdev); + pci_set_drvdata(pdev, NULL); } static int airo_pci_suspend(struct pci_dev *pdev, pm_message_t state)