---

yaml --- r: 47534 b: refs/heads/master c: c493edd h: refs/heads/master v: v3
git-mirror · Feb 11, 2007 · 61932fa · 61932fa
1 parent 1703dd2
commit 61932fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47c85c0db159bb0e5f8f5cb4ae7cc19a5c3359de
+refs/heads/master: c493edd13d633ba556cd71eeae9d062b6912c55d
diff --git a/trunk/drivers/char/mxser_new.c b/trunk/drivers/char/mxser_new.c
@@ -2398,13 +2398,9 @@ static int __devinit mxser_initbrd(struct mxser_board *brd,
 		outb(inb(info->ioaddr + UART_IER) & 0xf0,
 			info->ioaddr + UART_IER);
 	}
-	/*
-	 * Allocate the IRQ if necessary
-	 */
 
-	retval = request_irq(brd->irq, mxser_interrupt,
-			(brd->ports[0].flags & ASYNC_SHARE_IRQ) ? IRQF_SHARED :
-			IRQF_DISABLED, "mxser", brd);
+	retval = request_irq(brd->irq, mxser_interrupt, IRQF_SHARED, "mxser",
+			brd);
 	if (retval) {
 		printk(KERN_ERR "Board %s: Request irq failed, IRQ (%d) may "
 			"conflict with another device.\n",