aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2008-02-25 18:45:46 +0100
committerJeff Garzik <jeff@garzik.org>2008-03-05 06:27:50 -0500
commitf25f0f8dcd99e954dc0acf2fcb556cbcd7394549 (patch)
tree06a85e7c9d023dce8eed5a10ac3dd6ff2a401bf5
parent8b7c1664405a1262bb78e80011ec10aa6b79df81 (diff)
de2104x: remove BUG_ON() when changing media type
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@rainbow-software.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/tulip/de2104x.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 77d9dd7ea34..567c62757e9 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -910,7 +910,8 @@ static void de_set_media (struct de_private *de)
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);