diff options
| author | Alexander Beregalov <a.beregalov@gmail.com> | 2009-04-11 16:50:23 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-14 00:44:36 +0200 |
| commit | 0ee904c35cc3fdd26a9c76077d9692d458309186 (patch) | |
| tree | ce1dee044974b7c6040bbdb794747cd1baa8f6bb /drivers/net/tulip/winbond-840.c | |
| parent | kaweth: Clean up code (diff) | |
| download | linux-0ee904c35cc3fdd26a9c76077d9692d458309186.tar.xz linux-0ee904c35cc3fdd26a9c76077d9692d458309186.zip | |
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>
Diffstat (limited to 'drivers/net/tulip/winbond-840.c')
| -rw-r--r-- | drivers/net/tulip/winbond-840.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index 264e61404f34..842b1a2c40d4 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c @@ -1601,8 +1601,7 @@ static int w840_suspend (struct pci_dev *pdev, pm_message_t state) /* 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); */ |