diff options
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_6527.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_6527.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c index e84dac2bf3b2..45fb601e4080 100644 --- a/drivers/staging/comedi/drivers/ni_6527.c +++ b/drivers/staging/comedi/drivers/ni_6527.c @@ -252,10 +252,9 @@ static int ni6527_intr_cmdtest(struct comedi_device *dev, if (err) return 3; - /* step 4: fix up any arguments */ + /* Step 4: fix up any arguments */ - if (err) - return 4; + /* Step 5: check channel list if it exists */ return 0; } @@ -472,11 +471,7 @@ static void ni6527_detach(struct comedi_device *dev) { if (dev->mmio) ni6527_reset(dev); - if (dev->irq) - free_irq(dev->irq, dev); - if (dev->mmio) - iounmap(dev->mmio); - comedi_pci_disable(dev); + comedi_pci_detach(dev); } static struct comedi_driver ni6527_driver = { |