diff options
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 7a9a3fa55425..e789792a36bc 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -2289,11 +2289,7 @@ static int b43_upload_microcode(struct b43_wldev *dev) | |||
2289 | err = -ENODEV; | 2289 | err = -ENODEV; |
2290 | goto error; | 2290 | goto error; |
2291 | } | 2291 | } |
2292 | msleep_interruptible(50); | 2292 | msleep(50); |
2293 | if (signal_pending(current)) { | ||
2294 | err = -EINTR; | ||
2295 | goto error; | ||
2296 | } | ||
2297 | } | 2293 | } |
2298 | b43_read32(dev, B43_MMIO_GEN_IRQ_REASON); /* dummy read */ | 2294 | b43_read32(dev, B43_MMIO_GEN_IRQ_REASON); /* dummy read */ |
2299 | 2295 | ||
@@ -4287,6 +4283,8 @@ static int b43_wireless_core_init(struct b43_wldev *dev) | |||
4287 | if (!dev->suspend_in_progress) | 4283 | if (!dev->suspend_in_progress) |
4288 | b43_rng_init(wl); | 4284 | b43_rng_init(wl); |
4289 | 4285 | ||
4286 | ieee80211_wake_queues(dev->wl->hw); | ||
4287 | |||
4290 | b43_set_status(dev, B43_STAT_INITIALIZED); | 4288 | b43_set_status(dev, B43_STAT_INITIALIZED); |
4291 | 4289 | ||
4292 | if (!dev->suspend_in_progress) | 4290 | if (!dev->suspend_in_progress) |