diff options
| author |   Cyrill V. Gorcunov <gorcunov@gmail.com> | 2007-03-26 21:47:26 -0800 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2007-03-28 02:18:51 -0400 |
| commit | c14bac628b9fad6fd4dad8fbb9e864c61a8924c9 (patch) | |
| tree | 9f0dbaa87f077fbbf250414db91a1fb4fc66dfa2 /drivers/net/sun3lance.c | |
| parent | mv643xx_eth: Fix use of uninitialized port_num field (diff) | |
| download | linux-dev-c14bac628b9fad6fd4dad8fbb9e864c61a8924c9.tar.xz linux-dev-c14bac628b9fad6fd4dad8fbb9e864c61a8924c9.zip | |
SUN3/3X Lance trivial fix improved
This patch adds checking for allocated DVMA memory and granted IRQ line.
Signed-off-by: Cyrill V. Gorcunov <gorcunov@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/sun3lance.c')
| -rw-r--r-- | drivers/net/sun3lance.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c index c62e85d89f41..7bee45b42a2c 100644 --- a/drivers/net/sun3lance.c +++ b/drivers/net/sun3lance.c @@ -336,13 +336,27 @@ static int __init lance_probe( struct net_device *dev) /* XXX - leak? */ MEM = dvma_malloc_align(sizeof(struct lance_memory), 0x10000); + if (MEM == NULL) { +#ifdef CONFIG_SUN3 + iounmap((void __iomem *)ioaddr); +#endif + printk(KERN_WARNING "SUN3 Lance couldn't allocate DVMA memory\n"); + return 0; + } lp->iobase = (volatile unsigned short *)ioaddr; dev->base_addr = (unsigned long)ioaddr; /* informational only */ REGA(CSR0) = CSR0_STOP; - request_irq(LANCE_IRQ, lance_interrupt, IRQF_DISABLED, "SUN3 Lance", dev); + if (request_irq(LANCE_IRQ, lance_interrupt, IRQF_DISABLED, "SUN3 Lance", dev) < 0) { +#ifdef CONFIG_SUN3 + iounmap((void __iomem *)ioaddr); +#endif + dvma_free((void *)MEM); + printk(KERN_WARNING "SUN3 Lance unable to allocate IRQ\n"); + return 0; + } dev->irq = (unsigned short)LANCE_IRQ; |