staging: comedi_pci: make comedi_pci_disable() safe to call

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

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 141a3f7bbf15bf065aa8f3d625c24f23b87eb8ea..6bc1347eaf68271f614ed08465ef6a4602d8b38c 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -1697,16 +1697,11 @@ static int me4000_auto_attach(struct comedi_device *dev,
 
 static void me4000_detach(struct comedi_device *dev)
 {
-       struct pci_dev *pcidev = comedi_to_pci_dev(dev);
-
        if (dev->irq)
                free_irq(dev->irq, dev);
-       if (pcidev) {
-               if (dev->iobase) {
-                       me4000_reset(dev);
-                       comedi_pci_disable(pcidev);
-               }
-       }
+       if (dev->iobase)
+               me4000_reset(dev);
+       comedi_pci_disable(dev);
 }
 
 static struct comedi_driver me4000_driver = {