Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[deliverable/linux.git] / drivers / net / wireless / b43 / main.c

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 7a9a3fa5542590f76d306f7f00be413cfb208486..e789792a36bc468f88d688f984c299a78927424c 100644 (file)
--- 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)
                        err = -ENODEV;
                        goto error;
                }
-               msleep_interruptible(50);
-               if (signal_pending(current)) {
-                       err = -EINTR;
-                       goto error;
-               }
+               msleep(50);
        }
        b43_read32(dev, B43_MMIO_GEN_IRQ_REASON);       /* dummy read */
 
@@ -4287,6 +4283,8 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
        if (!dev->suspend_in_progress)
                b43_rng_init(wl);
 
+       ieee80211_wake_queues(dev->wl->hw);
+
        b43_set_status(dev, B43_STAT_INITIALIZED);
 
        if (!dev->suspend_in_progress)