diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-07-20 06:04:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-07-21 23:18:22 +0200 |
| commit | b77d35b7229164304d6fb8f047b9bcd3da2c9592 (patch) | |
| tree | abc1aeef78696312d4eba710292de7330776d42f | |
| parent | [SPARC]: Get sun4d SMP building again. (diff) | |
| download | linux-b77d35b7229164304d6fb8f047b9bcd3da2c9592.tar.xz linux-b77d35b7229164304d6fb8f047b9bcd3da2c9592.zip | |
[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>
| -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 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]; |