From: Jussi Kivilinna Date: Mon, 31 Jan 2011 18:50:02 +0000 (+0200) Subject: zd1211rw: reset device when CR_BCN_FIFO_SEMAPHORE freezes in beacon setup X-Git-Tag: v2.6.39-rc1~468^2~403^2~16 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3985a46543d47a50b94e839e0a16e67d959ab092;p=platform%2Fkernel%2Flinux-stable.git zd1211rw: reset device when CR_BCN_FIFO_SEMAPHORE freezes in beacon setup When driver fails to acquire device semaphore lock, device usually freezes soon afterwards. So failing to acquire lock indicates us that not everything is going right in device/fw. So reset device when this happens. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index a590a94..beaa969 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c @@ -703,7 +703,7 @@ static int zd_mac_config_beacon(struct ieee80211_hw *hw, struct sk_buff *beacon) dev_err(zd_mac_dev(mac), "Giving up beacon config.\n"); r = -ETIMEDOUT; - goto release_sema; + goto reset_device; } } msleep(20); @@ -770,6 +770,17 @@ out: mutex_unlock(&mac->chip.mutex); kfree(ioreqs); return r; + +reset_device: + mutex_unlock(&mac->chip.mutex); + kfree(ioreqs); + + /* semaphore stuck, reset device to avoid fw freeze later */ + dev_warn(zd_mac_dev(mac), "CR_BCN_FIFO_SEMAPHORE stuck, " + "reseting device..."); + usb_queue_reset_device(mac->chip.usb.intf); + + return r; } static int fill_ctrlset(struct zd_mac *mac,