aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <weiyj.lk@gmail.com>2016-10-01 00:38:08 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-02 17:32:17 +0200
commit23bf40424a0f641ca7ff4225add4aa592086bdd5 (patch)
tree6c312d33e56db92c0083515b8574d5772586c35d
parent612e1c94bfe9736cef0a9b86db792fd863be7733 (diff)
downloadsoftirq-debug-23bf40424a0f641ca7ff4225add4aa592086bdd5.tar.gz
staging: rtl8188eu: fix double unlock error in rtw_resume_process()
Fix following static checker warning: drivers/staging/rtl8188eu/os_dep/usb_intf.c:311 rtw_resume_process() error: double unlock 'mutex:&pwrpriv->mutex_lock' Fixes: eaf47b713b60 ("staging: rtl8188eu: fix missing unlock on error in rtw_resume_process()") Reported-By: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/rtl8188eu/os_dep/usb_intf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index b2bc09e0297ccc..68e1e6bbe87f16 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -294,8 +294,10 @@ static int rtw_resume_process(struct adapter *padapter)
pwrpriv->bkeepfwalive = false;
pr_debug("bkeepfwalive(%x)\n", pwrpriv->bkeepfwalive);
- if (pm_netdev_open(pnetdev, true) != 0)
+ if (pm_netdev_open(pnetdev, true) != 0) {
+ mutex_unlock(&pwrpriv->mutex_lock);
goto exit;
+ }
netif_device_attach(pnetdev);
netif_carrier_on(pnetdev);
@@ -306,10 +308,8 @@ static int rtw_resume_process(struct adapter *padapter)
ret = 0;
exit:
- if (pwrpriv) {
+ if (pwrpriv)
pwrpriv->bInSuspend = false;
- mutex_unlock(&pwrpriv->mutex_lock);
- }
pr_debug("<=== %s return %d.............. in %dms\n", __func__,
ret, jiffies_to_msecs(jiffies - start_time));