From: Ian Abbott Date: Mon, 28 Jul 2014 12:09:30 +0000 (+0100) Subject: staging: comedi: amplc_pc236: don't disable h/w interrupt on detach() X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e7637a912911ae4346e19e954d9481f7a5b0e48b;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: Greg Kroah-Hartman --- 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)) {