[PATCH] airo: disable the PCI device when unloading module
Fix an assymetry between pci_{enable,disable}_device. airo did not disable the PCI device when unloading the module. This caused suspend failures after modprobe -r airo && modprobe airo. Signed-off-by: Michal Schmidt <mschmidt@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
a62056f0b0
commit
777ec5e9ce
|
@ -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);
|
dev = _init_airo_card(pdev->irq, pdev->resource[0].start, 0, pdev, &pdev->dev);
|
||||||
else
|
else
|
||||||
dev = _init_airo_card(pdev->irq, pdev->resource[2].start, 0, pdev, &pdev->dev);
|
dev = _init_airo_card(pdev->irq, pdev->resource[2].start, 0, pdev, &pdev->dev);
|
||||||
if (!dev)
|
if (!dev) {
|
||||||
|
pci_disable_device(pdev);
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
}
|
||||||
|
|
||||||
pci_set_drvdata(pdev, dev);
|
pci_set_drvdata(pdev, dev);
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -5610,6 +5612,8 @@ static void __devexit airo_pci_remove(struct pci_dev *pdev)
|
||||||
|
|
||||||
airo_print_info(dev->name, "Unregistering...");
|
airo_print_info(dev->name, "Unregistering...");
|
||||||
stop_airo_card(dev, 1);
|
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)
|
static int airo_pci_suspend(struct pci_dev *pdev, pm_message_t state)
|
||||||
|
|
Loading…
Reference in a new issue