staging: comedi_pci: make comedi_pci_disable() safe to call

[karo-tx-linux.git] / drivers / staging / comedi / drivers / amplc_pc236.c

diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c
index 479e10fddd22e128115f1a5afdf24126c40cbb34..45168488503d9691d59fa8adae93a4101eb2e1ee 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/drivers/staging/comedi/drivers/amplc_pc236.c
@@ -576,11 +576,9 @@ static void pc236_detach(struct comedi_device *dev)
                        release_region(dev->iobase, PC236_IO_SIZE);
        } else if (is_pci_board(thisboard)) {
                struct pci_dev *pcidev = comedi_to_pci_dev(dev);
-               if (pcidev) {
-                       if (dev->iobase)
-                               comedi_pci_disable(pcidev);
+               comedi_pci_disable(dev);
+               if (pcidev)
                        pci_dev_put(pcidev);
-               }
        }
 }
 
@@ -610,9 +608,10 @@ static DEFINE_PCI_DEVICE_TABLE(pc236_pci_table) = {
 MODULE_DEVICE_TABLE(pci, pc236_pci_table);
 
 static int amplc_pc236_pci_probe(struct pci_dev *dev,
-                                          const struct pci_device_id *ent)
+                                const struct pci_device_id *id)
 {
-       return comedi_pci_auto_config(dev, &amplc_pc236_driver);
+       return comedi_pci_auto_config(dev, &amplc_pc236_driver,
+                                     id->driver_data);
 }
 
 static struct pci_driver amplc_pc236_pci_driver = {