Commit 0774c2b5 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: addi_apci_2032: interrupt safety change

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: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d9f54202
...@@ -237,6 +237,9 @@ static irqreturn_t apci2032_interrupt(int irq, void *d) ...@@ -237,6 +237,9 @@ static irqreturn_t apci2032_interrupt(int irq, void *d)
struct comedi_subdevice *s = dev->read_subdev; struct comedi_subdevice *s = dev->read_subdev;
unsigned int val; unsigned int val;
if (!dev->attached)
return IRQ_NONE;
/* Check if VCC OR CC interrupt has occurred */ /* Check if VCC OR CC interrupt has occurred */
val = inl(dev->iobase + APCI2032_STATUS_REG) & APCI2032_STATUS_IRQ; val = inl(dev->iobase + APCI2032_STATUS_REG) & APCI2032_STATUS_IRQ;
if (!val) if (!val)
...@@ -281,6 +284,7 @@ static int apci2032_auto_attach(struct comedi_device *dev, ...@@ -281,6 +284,7 @@ static int apci2032_auto_attach(struct comedi_device *dev,
if (ret) if (ret)
return ret; return ret;
dev->iobase = pci_resource_start(pcidev, 1); dev->iobase = pci_resource_start(pcidev, 1);
apci2032_reset(dev);
if (pcidev->irq > 0) { if (pcidev->irq > 0) {
ret = request_irq(pcidev->irq, apci2032_interrupt, ret = request_irq(pcidev->irq, apci2032_interrupt,
...@@ -329,7 +333,6 @@ static int apci2032_auto_attach(struct comedi_device *dev, ...@@ -329,7 +333,6 @@ static int apci2032_auto_attach(struct comedi_device *dev,
s->type = COMEDI_SUBD_UNUSED; s->type = COMEDI_SUBD_UNUSED;
} }
apci2032_reset(dev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment