Commit 91d372c0 authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville

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: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 44fdd375
...@@ -2289,11 +2289,7 @@ static int b43_upload_microcode(struct b43_wldev *dev) ...@@ -2289,11 +2289,7 @@ static int b43_upload_microcode(struct b43_wldev *dev)
err = -ENODEV; err = -ENODEV;
goto error; goto error;
} }
msleep_interruptible(50); msleep(50);
if (signal_pending(current)) {
err = -EINTR;
goto error;
}
} }
b43_read32(dev, B43_MMIO_GEN_IRQ_REASON); /* dummy read */ b43_read32(dev, B43_MMIO_GEN_IRQ_REASON); /* dummy read */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment