From: Avraham Stern <avraham.stern@xxxxxxxxx>
wait_event_timeout() return value indicates whether the condition
evaluated to true or not, so no need to re-take the lock and
check the got_ownership flag.
Signed-off-by: Avraham Stern <avraham.stern@xxxxxxxxx>
Signed-off-by: Gregory Greenman <gregory.greenman@xxxxxxxxx>
---
drivers/net/wireless/intel/iwlwifi/mei/main.c | 21 +------------------
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mei/main.c b/drivers/net/wireless/intel/iwlwifi/mei/main.c
index a467da8b2aed..ef5d2938deb5 100644
--- a/drivers/net/wireless/intel/iwlwifi/mei/main.c
+++ b/drivers/net/wireless/intel/iwlwifi/mei/main.c
@@ -1447,26 +1447,7 @@ int iwl_mei_get_ownership(void)
ret = wait_event_timeout(mei->get_ownership_wq,
mei->got_ownership, HZ / 2);
- if (!ret)
- return -ETIMEDOUT;
-
- mutex_lock(&iwl_mei_mutex);
-
- /* In case we didn't have a bind */
- if (!iwl_mei_is_connected()) {
- ret = 0;
- goto out;
- }
-
- mei = mei_cldev_get_drvdata(iwl_mei_global_cldev);
-
- if (!mei) {
- ret = -ENODEV;
- goto out;
- }
-
- ret = !mei->got_ownership;
-
+ return (!ret) ? -ETIMEDOUT : 0;
out:
mutex_unlock(&iwl_mei_mutex);
return ret;
--
2.35.3
