commit 0ee904c35cc3fdd26a9c76077d9692d458309186
author Alexander Beregalov <a.beregalov@gmail.com> Sat Apr 11 14:50:23 2009 +0000
committer David S. Miller <davem@davemloft.net> Mon Apr 13 15:44:36 2009 -0700
tree ce1dee044974b7c6040bbdb794747cd1baa8f6bb
parent 710b523ac59426e8bfdea3533f42118e46b9cbfb

drivers/net: replace BUG() with BUG_ON() if possible

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/net/tulip/winbond-840.c

diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 264e614..842b1a2c 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -1601,8 +1601,7 @@
 
 		/* no more hardware accesses behind this line. */
 
-		BUG_ON(np->csr6);
-		if (ioread32(ioaddr + IntrEnable)) BUG();
+		BUG_ON(np->csr6 || ioread32(ioaddr + IntrEnable));
 
 		/* pci_power_off(pdev, -1); */