---

yaml --- r: 87203 b: refs/heads/master c: f25f0f8 h: refs/heads/master i: 87201: 28fd300 87199: 217c988 v: v3
git-mirror · Mar 5, 2008 · 3e874c8 · 3e874c8
1 parent 15dda72
commit 3e874c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b7c1664405a1262bb78e80011ec10aa6b79df81
+refs/heads/master: f25f0f8dcd99e954dc0acf2fcb556cbcd7394549
diff --git a/trunk/drivers/net/tulip/de2104x.c b/trunk/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);