X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=net%2Fsched%2Fsch_generic.c;h=fd2a6cadb1155429fff6de7aa4045ef00899deb9;hb=547b792cac0a038b9dbf958d3c120df3740b5572;hp=43abd4d27ea6d767ae9c2227510b2628bb3d2a90;hpb=53e5e96ec18da6f65e89f05674711e1c93d8df67;p=linux-2.6-omap-h63xx.git

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 43abd4d27ea..fd2a6cadb11 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -746,5 +746,5 @@ void dev_shutdown(struct net_device *dev)
 {
 	netdev_for_each_tx_queue(dev, shutdown_scheduler_queue, &noop_qdisc);
 	shutdown_scheduler_queue(dev, &dev->rx_queue, NULL);
-	BUG_TRAP(!timer_pending(&dev->watchdog_timer));
+	WARN_ON(timer_pending(&dev->watchdog_timer));
 }