]> err.no Git - linux-2.6/commitdiff
[SERIAL] sunzilog: Remove duplicate IRQ registry in zs_probe().
authorDavid S. Miller <davem@sunset.davemloft.net>
Thu, 20 Jul 2006 04:04:04 +0000 (21:04 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Fri, 21 Jul 2006 21:18:22 +0000 (14:18 -0700)
We do it now in sunzilog_init() after all devices have been
probed.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/serial/sunzilog.c

index 496810c50947ff404de614edfea784c31708506f..18df10f49aff8d57a5ee8853a8e20c5b87dbd128 100644 (file)
@@ -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];