From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751707AbXBFLrQ (ORCPT ); Tue, 6 Feb 2007 06:47:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751710AbXBFLrQ (ORCPT ); Tue, 6 Feb 2007 06:47:16 -0500 Received: from cacti.profiwh.com ([85.93.165.66]:35348 "EHLO cacti.profiwh.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751679AbXBFLrQ (ORCPT ); Tue, 6 Feb 2007 06:47:16 -0500 Message-ID: <45C86AD8.20701@gmail.com> Date: Tue, 06 Feb 2007 12:47:36 +0100 From: Jiri Slaby User-Agent: Thunderbird 2.0b2 (X11/20070116) MIME-Version: 1.0 To: Jiri Slaby Cc: "Cyrill V. Gorcunov" , Sam Creasey , linux-kernel-list Subject: Re: [PATCH] SUN3/3X Lance trivial fix References: <20070205191321.GA12839@cvg> <45C8683C.1070409@gmail.com> <45C86A57.4070308@gmail.com> In-Reply-To: <45C86A57.4070308@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Jiri Slaby napsal(a): > Jiri Slaby napsal(a): >> Cyrill V. Gorcunov napsal(a): >>> This patch adds checking for allocated DVMA >>> memory and granted IRQ line. >>> >>> Signed-off-by: Cyrill V. Gorcunov >>> >>> --- >>> >>> 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"); And also iounmap() here... >>> + return 0; >>> + } >>> >>> lp->iobase = (volatile unsigned short *)ioaddr; >>> dev->base_addr = (unsigned long)ioaddr; /* informational only */ >> >> But now, if it fails (and you return 0=OK state) these are not assigned > > Ok, 0 is not OK state, I see it now. > >> and probably used later. >> >>> >>> 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"); > > But in that case, you want to dvma_free() here? And here. >>> + return 0; >>> + } >>> dev->irq = (unsigned short)LANCE_IRQ; regards, -- http://www.fi.muni.cz/~xslaby/ Jiri Slaby faculty of informatics, masaryk university, brno, cz e-mail: jirislaby gmail com, gpg pubkey fingerprint: B674 9967 0407 CE62 ACC8 22A0 32CC 55C3 39D4 7A7E