diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
| commit | adf6d34e460387ee3e8f1e1875d52bff51212c7d (patch) | |
| tree | 88ef100143e6184103a608f82dfd232bf6376eaf /drivers/net/wireless/b43/main.c | |
| parent | d1964dab60ce7c104dd21590e987a8787db18051 (diff) | |
| parent | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (diff) | |
Merge branch 'omap2-upstream' into devel
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
| -rw-r--r-- | drivers/net/wireless/b43/main.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 51dfce16178a..c73a75b24cd6 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
| @@ -2049,7 +2049,6 @@ void b43_mac_enable(struct b43_wldev *dev) | |||
| 2049 | { | 2049 | { |
| 2050 | dev->mac_suspended--; | 2050 | dev->mac_suspended--; |
| 2051 | B43_WARN_ON(dev->mac_suspended < 0); | 2051 | B43_WARN_ON(dev->mac_suspended < 0); |
| 2052 | B43_WARN_ON(irqs_disabled()); | ||
| 2053 | if (dev->mac_suspended == 0) { | 2052 | if (dev->mac_suspended == 0) { |
| 2054 | b43_write32(dev, B43_MMIO_MACCTL, | 2053 | b43_write32(dev, B43_MMIO_MACCTL, |
| 2055 | b43_read32(dev, B43_MMIO_MACCTL) | 2054 | b43_read32(dev, B43_MMIO_MACCTL) |
| @@ -2075,7 +2074,6 @@ void b43_mac_suspend(struct b43_wldev *dev) | |||
| 2075 | u32 tmp; | 2074 | u32 tmp; |
| 2076 | 2075 | ||
| 2077 | might_sleep(); | 2076 | might_sleep(); |
| 2078 | B43_WARN_ON(irqs_disabled()); | ||
| 2079 | B43_WARN_ON(dev->mac_suspended < 0); | 2077 | B43_WARN_ON(dev->mac_suspended < 0); |
| 2080 | 2078 | ||
| 2081 | if (dev->mac_suspended == 0) { | 2079 | if (dev->mac_suspended == 0) { |