From: David S. Miller <davem@sunset.davemloft.net>
Date: Thu, 20 Jul 2006 04:04:04 +0000 (-0700)
Subject: [SERIAL] sunzilog: Remove duplicate IRQ registry in zs_probe().
X-Git-Tag: v2.6.18-rc3~63
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b77d35b7229164304d6fb8f047b9bcd3da2c9592;p=linux-2.6-omap-h63xx.git

[SERIAL] sunzilog: Remove duplicate IRQ registry in zs_probe().

We do it now in sunzilog_init() after all devices have been
probed.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 496810c5094..18df10f49af 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1351,16 +1351,8 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
 
 	rp = sunzilog_chip_regs[inst];
 
-	if (zilog_irq == -1) {
+	if (zilog_irq == -1)
 		zilog_irq = op->irqs[0];
-		err = request_irq(zilog_irq, sunzilog_interrupt, IRQF_SHARED,
-				  "zs", sunzilog_irq_chain);
-		if (err) {
-			of_iounmap(rp, sizeof(struct zilog_layout));
-
-			return err;
-		}
-	}
 
 	up = &sunzilog_port_table[inst * 2];