LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] SUN3/3X Lance trivial fix
@ 2007-02-05 19:13 Cyrill V. Gorcunov
  2007-02-05 20:01 ` Sam Creasey
  2007-02-06 11:36 ` Jiri Slaby
  0 siblings, 2 replies; 6+ messages in thread
From: Cyrill V. Gorcunov @ 2007-02-05 19:13 UTC (permalink / raw)
  To: Sam Creasey; +Cc: linux-kernel-list

This patch adds checking for allocated DVMA
memory and granted IRQ line.

Signed-off-by: Cyrill V. Gorcunov <gorcunov@gmail.com>

---

 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;
 
 

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2007-02-06 12:55 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-05 19:13 [PATCH] SUN3/3X Lance trivial fix Cyrill V. Gorcunov
2007-02-05 20:01 ` Sam Creasey
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

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).