Message ID | 200909111831.33136.mb@bu3sch.de (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
Index: wireless-testing/drivers/net/wireless/b43/main.c =================================================================== --- wireless-testing.orig/drivers/net/wireless/b43/main.c 2009-09-11 18:24:59.000000000 +0200 +++ wireless-testing/drivers/net/wireless/b43/main.c 2009-09-11 18:25:13.000000000 +0200 @@ -2309,11 +2309,7 @@ static int b43_upload_microcode(struct b 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 */
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> ---