| Message ID | 1389469714-13040-4-git-send-email-Larry.Finger@lwfinger.net |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 5726688..bd5f142 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c @@ -1546,8 +1546,9 @@ static int do_request_fw(struct b43legacy_wldev *dev, b43legacyerr(dev->wl, "Unable to load firmware\n"); return err; } - /* stall here until fw ready */ - wait_for_completion(&dev->fw_load_complete); + /* stall here until fw ready or 60 sec elapses */ + wait_for_completion_timeout(&dev->fw_load_complete, + msecs_to_jiffies(60000)); if (!dev->fwp) err = -EINVAL; *fw = dev->fwp;
On openSUSE systems, the script that installs the firmware for b43legacy also unloads and reloads the driver. When the firmware was not previously available, the driver has stalled at a wait_for_completion(). When the unload routine releases that hold, the driver encounters structures that have already been deleted and generates a fatal condition. When the user does a manual restart, the file system cleanup frequently results in the firmware files being deleted and the user is never able to install the firmware. The fix is to change the wait_for_completion() with a wait_for_completion_timeout() with a 60 second wait period. There is a potential race condition; however, the chances that less than a minute has elapsed between the initial driver load and a subsequent unload is very unlikely. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Cc: Stable <stable@vger.kernel.org> --- drivers/net/wireless/b43legacy/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)