diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-29 09:16:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-29 09:16:25 +0200 |
| commit | 348b346b238d9c0e5694c8d0b835a099cb383835 (patch) | |
| tree | 967d9c72a1d6d33a408a1ff0d732296dbe8d3674 /drivers/net/tulip/winbond-840.c | |
| parent | 6c697bdf08a09ce461e305a22362973036e95db3 (diff) | |
| parent | 52989765629e7d182b4f146050ebba0abf2cb0b7 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: we will merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 264e61404f3..842b1a2c40d 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); */ |