diff options
| author |   Ian Abbott <abbotti@mev.co.uk> | 2014-07-28 13:09:30 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-30 16:48:42 -0700 |
| commit | e7637a912911ae4346e19e954d9481f7a5b0e48b (patch) | |
| tree | a34d220b7c9275a5e823facb25cb6e7f120d80df | |
| parent | staging: comedi: amplc_pc236: move static board data (diff) | |
| download | linux-dev-e7637a912911ae4346e19e954d9481f7a5b0e48b.tar.xz linux-dev-e7637a912911ae4346e19e954d9481f7a5b0e48b.zip | |
staging: comedi: amplc_pc236: don't disable h/w interrupt on detach()
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_pc236.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c index c96519d89179..32275a5ff169 100644 --- a/drivers/staging/comedi/drivers/amplc_pc236.c +++ b/drivers/staging/comedi/drivers/amplc_pc236.c @@ -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)) { |