---

yaml --- r: 353914 b: refs/heads/master c: 0774c2b h: refs/heads/master v: v3
git-mirror · Jan 7, 2013 · be73745 · be73745
1 parent 1ea7647
commit be73745
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9f5420268ca9b2bbe62f14757fac3e10eaf1ebf
+refs/heads/master: 0774c2b5c1e0025cb016393d8552171c0ec55c39
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c b/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c
@@ -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;
 }