---

yaml --- r: 354362 b: refs/heads/master c: bcd22e8 h: refs/heads/master v: v3
git-mirror · Feb 4, 2013 · 9ca96ad · 9ca96ad
1 parent 9cbec44
commit 9ca96ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e29ce104a83d801c7fc6bc57c189608195e831e
+refs/heads/master: bcd22e8ecee9f48f8668418cef5d523f219f7d1a
diff --git a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -418,12 +418,9 @@ static int das16cs_auto_attach(struct comedi_device *dev,
 		return ret;
 	dev->iobase = link->resource[0]->start;
 
-	if (!link->irq)
-		return -EINVAL;
-
-	ret = request_irq(link->irq, das16cs_interrupt, IRQF_SHARED,
-			  dev->board_name, dev);
-	if (ret < 0)
+	link->priv = dev;
+	ret = pcmcia_request_irq(link, das16cs_interrupt);
+	if (ret)
 		return ret;
 	dev->irq = link->irq;
 
@@ -482,8 +479,6 @@ static int das16cs_auto_attach(struct comedi_device *dev,
 
 static void das16cs_detach(struct comedi_device *dev)
 {
-	if (dev->irq)
-		free_irq(dev->irq, dev);
 	comedi_pcmcia_disable(dev);
 }