diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-07-20 00:04:04 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-07-21 17:18:22 -0400 |
commit | b77d35b7229164304d6fb8f047b9bcd3da2c9592 (patch) | |
tree | abc1aeef78696312d4eba710292de7330776d42f /drivers/serial/sunzilog.c | |
parent | 8b3c848cc89e62904e6d9c8f9fed13d5c225572d (diff) |
[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>
Diffstat (limited to 'drivers/serial/sunzilog.c')
-rw-r--r-- | drivers/serial/sunzilog.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index 496810c50947..18df10f49aff 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 | |||
1351 | 1351 | ||
1352 | rp = sunzilog_chip_regs[inst]; | 1352 | rp = sunzilog_chip_regs[inst]; |
1353 | 1353 | ||
1354 | if (zilog_irq == -1) { | 1354 | if (zilog_irq == -1) |
1355 | zilog_irq = op->irqs[0]; | 1355 | zilog_irq = op->irqs[0]; |
1356 | err = request_irq(zilog_irq, sunzilog_interrupt, IRQF_SHARED, | ||
1357 | "zs", sunzilog_irq_chain); | ||
1358 | if (err) { | ||
1359 | of_iounmap(rp, sizeof(struct zilog_layout)); | ||
1360 | |||
1361 | return err; | ||
1362 | } | ||
1363 | } | ||
1364 | 1356 | ||
1365 | up = &sunzilog_port_table[inst * 2]; | 1357 | up = &sunzilog_port_table[inst * 2]; |
1366 | 1358 | ||