Messages in this thread | | | Date | Mon, 5 Feb 2007 15:01:56 -0500 | Subject | Re: [PATCH] SUN3/3X Lance trivial fix | From | Sam Creasey <> |
| |
On Mon, Feb 05, 2007 at 10:13:21PM +0300, Cyrill V. Gorcunov wrote: > This patch adds checking for allocated DVMA > memory and granted IRQ line. > > Signed-off-by: Cyrill V. Gorcunov <gorcunov@gmail.com>
Acked-by: Sam Creasey <sammy@sammy.net>
Included in my tree for rolling back into m68k. I'm fine with it going upstream as well.
-- Sam
> --- > > drivers/net/sun3lance.c | 9 ++++++++- > 1 files changed, 8 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c > index c62e85d..e4c2c88 100644 > --- a/drivers/net/sun3lance.c > +++ b/drivers/net/sun3lance.c > @@ -336,13 +336,20 @@ static int __init lance_probe( struct net_device *dev) > > /* XXX - leak? */ > MEM = dvma_malloc_align(sizeof(struct lance_memory), 0x10000); > + if (MEM == NULL) { > + 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) { > + printk(KERN_WARNING "SUN3 Lance unable to allocate IRQ\n"); > + return 0; > + } > dev->irq = (unsigned short)LANCE_IRQ; > > - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |