LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Sam Creasey <sammy@sammy.net>
To: "Cyrill V. Gorcunov" <gorcunov@gmail.com>
Cc: linux-kernel-list <linux-kernel@vger.kernel.org>,
	linux-m68k@vger.kernel.org
Subject: Re: [PATCH] SUN3/3X Lance trivial fix
Date: Mon, 5 Feb 2007 15:01:56 -0500	[thread overview]
Message-ID: <20070205200155.GC28224@sammy.net> (raw)
In-Reply-To: <20070205191321.GA12839@cvg>

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;
>  
>  

  reply	other threads:[~2007-02-05 20:29 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-05 19:13 Cyrill V. Gorcunov
2007-02-05 20:01 ` Sam Creasey [this message]
2007-02-06 11:36 ` Jiri Slaby
2007-02-06 11:45   ` Jiri Slaby
2007-02-06 11:47     ` Jiri Slaby
2007-02-06 12:52       ` Cyrill V. Gorcunov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070205200155.GC28224@sammy.net \
    --to=sammy@sammy.net \
    --cc=gorcunov@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@vger.kernel.org \
    --subject='Re: [PATCH] SUN3/3X Lance trivial fix' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).