staging: comedi: amplc_pc236: don't disable h/w interrupt on detach()
authorIan Abbott <abbotti@mev.co.uk>
Mon, 28 Jul 2014 12:09:30 +0000 (13:09 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Jul 2014 23:48:42 +0000 (16:48 -0700)
If an asynchronous command was running when the device is being
detached, the comedi core would have called the subdevice `cancel`
handler (`pc236_intr_cancel()`) before calling the `detach` handler
(`pc236_detach()`).  Since the cancel handler disables hardware
interrupts (at least for the PCI236 board) by calling
`pc236_disable_intr()`, there is no need for the detach handler to do so
as well.  Remove the call to `pc236_disable_intr()` from
`pc236_detach()`.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/amplc_pc236.c

index c96519d8917902e784c7115913e370707954e69c..32275a5ff169b2011589ef3574e3174f37beddc1 100644 (file)
@@ -369,8 +369,6 @@ static void pc236_detach(struct comedi_device *dev)
 
        if (!thisboard)
                return;
-       if (dev->iobase)
-               pc236_intr_disable(dev);
        if (is_isa_board(thisboard)) {
                comedi_legacy_detach(dev);
        } else if (is_pci_board(thisboard)) {