summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2009-09-11 18:31:32 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-09-14 14:36:04 -0400
commite175e99646f21602d844ce85a727c83ba644ab87 (patch)
treeda42f01737702255933cda9fbb9e42351f88a4cf /drivers/net
parent54a68d14e0bc4f2328fb630a3058729f61452c2e (diff)
downloadop-kernel-dev-e175e99646f21602d844ce85a727c83ba644ab87.zip
op-kernel-dev-e175e99646f21602d844ce85a727c83ba644ab87.tar.gz
b43: Fix resume failure
This fixes a resume failure where a signal is pending on resume so the firmware upload fails. This removes the interruptible sleep, because we don't really need it. In the worst case (with broken firmware) the sleep loop will take 1 second. In the common case (working firmware), it will only take a few milliseconds. So we don't really need to be interruptible. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/b43/main.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 78e9834..e789792 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)
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 */
OpenPOWER on IntegriCloud