iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: addi_apci_2032: interrupt safety change

Browse Source 
Put the hardware into a safe state before enabling the interrupt.  In
the interrupt routine, check the device has been fully configured by
checking `dev->attached`.  In particular, `dev->read_subdev` could be
NULL early on and although the hardware's status register should
indicate no interrupt has occurred (since it's been put into a safe
state), it's better not to rely on it.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2012-12-03 18:15:40 +00:00 committed by Greg Kroah-Hartman
parent d9f5420268
commit 0774c2b5c1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/comedi/drivers/addi_apci_2032.c
View File

@ -237,6 +237,9 @@ static irqreturn_t apci2032_interrupt(int irq, void *d)
struct comedi_subdevice *s = dev->read_subdev;
unsigned int val;
if (!dev->attached)
return IRQ_NONE;
/* Check if VCC OR CC interrupt has occurred */
val = inl(dev->iobase + APCI2032_STATUS_REG) & APCI2032_STATUS_IRQ;
if (!val)
@ -281,6 +284,7 @@ static int apci2032_auto_attach(struct comedi_device *dev,
if (ret)
return ret;
dev->iobase = pci_resource_start(pcidev, 1);
apci2032_reset(dev);
if (pcidev->irq > 0) {
ret = request_irq(pcidev->irq, apci2032_interrupt,
@ -329,7 +333,6 @@ static int apci2032_auto_attach(struct comedi_device *dev,
s->type = COMEDI_SUBD_UNUSED;
}
apci2032_reset(dev);
return 0;
}