From ca5b07e3d0c277412f6056ad08eeee7311dabc47 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 11 Sep 2012 13:49:26 -0700
Subject: [PATCH] --- yaml --- r: 325197 b: refs/heads/master c:
 aa1b2cb3c5930bb332d756bd566771dcc83f251b h: refs/heads/master i:   325195:
 6b1ec63a68f5762778836e3029eb6be44cf6c50b v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/icp_multi.c        | 23 ++++++++-----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index e09533ef91a5..635fd259d83a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22d5ab0201f2621ebe834f309cb94d712427e62c
+refs/heads/master: aa1b2cb3c5930bb332d756bd566771dcc83f251b
diff --git a/trunk/drivers/staging/comedi/drivers/icp_multi.c b/trunk/drivers/staging/comedi/drivers/icp_multi.c
index 0fdab8db03d9..36336c1a3cfa 100644
--- a/trunk/drivers/staging/comedi/drivers/icp_multi.c
+++ b/trunk/drivers/staging/comedi/drivers/icp_multi.c
@@ -122,7 +122,6 @@ static unsigned short pci_list_builded;	/*>0 list of card is known */
 struct boardtype {
 	const char *name;	/*  driver name */
 	int device_id;
-	char have_irq;		/*  1=card support IRQ */
 };
 
 struct icp_multi_private {
@@ -767,20 +766,17 @@ static int icp_multi_attach(struct comedi_device *dev,
 
 	icp_multi_reset(dev);
 
-	if (this_board->have_irq) {
-		if (irq) {
-			if (request_irq(irq, interrupt_service_icp_multi,
-					IRQF_SHARED, "Inova Icp Multi", dev)) {
-				printk(KERN_WARNING
-				    "unable to allocate IRQ %u, DISABLING IT",
-				     irq);
-				irq = 0;	/* Can't use IRQ */
-			} else
-				printk(KERN_WARNING ", irq=%u", irq);
+	if (irq) {
+		if (request_irq(irq, interrupt_service_icp_multi,
+				IRQF_SHARED, "Inova Icp Multi", dev)) {
+			printk(KERN_WARNING
+				"unable to allocate IRQ %u, DISABLING IT",
+				irq);
+			irq = 0;	/* Can't use IRQ */
 		} else
-			printk(KERN_WARNING ", IRQ disabled");
+			printk(KERN_WARNING ", irq=%u", irq);
 	} else
-		irq = 0;
+		printk(KERN_WARNING ", IRQ disabled");
 
 	dev->irq = irq;
 
@@ -868,7 +864,6 @@ static const struct boardtype boardtypes[] = {
 	{
 		.name		= "icp_multi",
 		.device_id	= PCI_DEVICE_ID_ICP_MULTI,
-		.have_irq	= 1,
 	},
 };