Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f25f0f8d authored by Ondrej Zary's avatar Ondrej Zary Committed by Jeff Garzik
Browse files

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: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 8b7c1664

drivers/net/tulip/de2104x.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -910,7 +910,8 @@ static void de_set_media (struct de_private *de) 
	unsigned media = de->media_type;

	unsigned media = de->media_type;

	u32 macmode = dr32(MacMode);

	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)

	if (de->de21040)

		dw32(CSR11, FULL_DUPLEX_MAGIC);

		dw32(CSR11, FULL_DUPLEX_MAGIC);