summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorQiushi Wu <wu000273@umn.edu>2020-05-23 05:16:08 +0200
committerEnric Balletbo i Serra <enric.balletbo@collabora.com>2020-06-30 11:41:25 +0200
commitaaa3cbbac326c95308e315f1ab964a3369c4d07d (patch)
treec266c503d57c6c226a938eeb9beb2fdb30cc12d3 /drivers/platform
parentplatform/chrome: cros_ec_rpmsg: Document missing struct parameters (diff)
downloadlinux-aaa3cbbac326c95308e315f1ab964a3369c4d07d.tar.xz
linux-aaa3cbbac326c95308e315f1ab964a3369c4d07d.zip
platform/chrome: cros_ec_ishtp: Fix a double-unlock issue
In function cros_ec_ishtp_probe(), "up_write" is already called before function "cros_ec_dev_init". But "up_write" will be called again after the calling of the function "cros_ec_dev_init" failed. Thus add a call of the function “down_write” in this if branch for the completion of the exception handling. Fixes: 26a14267aff2 ("platform/chrome: Add ChromeOS EC ISHTP driver") Signed-off-by: Qiushi Wu <wu000273@umn.edu> Tested-by: Mathew King <mathewk@chromium.org> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/chrome/cros_ec_ishtp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/platform/chrome/cros_ec_ishtp.c b/drivers/platform/chrome/cros_ec_ishtp.c
index ed794a7ddba9..81364029af36 100644
--- a/drivers/platform/chrome/cros_ec_ishtp.c
+++ b/drivers/platform/chrome/cros_ec_ishtp.c
@@ -681,8 +681,10 @@ static int cros_ec_ishtp_probe(struct ishtp_cl_device *cl_device)
/* Register croc_ec_dev mfd */
rv = cros_ec_dev_init(client_data);
- if (rv)
+ if (rv) {
+ down_write(&init_lock);
goto end_cros_ec_dev_init_error;
+ }
return 0;