[<prev] [next>] [day] [month] [year] [list]
Message-Id: <200803042258.m24Mwgqn001400@imap1.linux-foundation.org>
Date: Tue, 04 Mar 2008 14:58:42 -0800
From: akpm@...ux-foundation.org
To: jeff@...zik.org
Cc: netdev@...r.kernel.org, akpm@...ux-foundation.org,
linux@...nbow-software.org, grundler@...isc-linux.org
Subject: [patch (for 2.6.25?) 2/3] de2104x: remove BUG_ON() when changing media type
From: Ondrej Zary <linux@...nbow-software.org>
When the chip dies (probably because of a bug somewhere in the driver),
de_stop_rxtx() fails and changing the media type crashes the whole machine.
Replace BUG_ON() in de_set_media() with a warning.
Signed-off-by: Ondrej Zary <linux@...nbow-software.org>
Cc: Jeff Garzik <jeff@...zik.org>
Acked-by: Grant Grundler <grundler@...isc-linux.org>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---
drivers/net/tulip/de2104x.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN drivers/net/tulip/de2104x.c~de2104x-remove-bug_on-when-changing-media-type drivers/net/tulip/de2104x.c
--- a/drivers/net/tulip/de2104x.c~de2104x-remove-bug_on-when-changing-media-type
+++ a/drivers/net/tulip/de2104x.c
@@ -910,7 +910,8 @@ static void de_set_media (struct de_priv
unsigned media = de->media_type;
u32 macmode = dr32(MacMode);
- BUG_ON(de_is_running(de));
+ if (de_is_running(de))
+ printk(KERN_WARNING "%s: chip is running while changing media!\n", de->dev->name);
if (de->de21040)
dw32(CSR11, FULL_DUPLEX_MAGIC);
_
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists