lkml.org 
[lkml]   [2020]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 119/232] platform/chrome: cros_ec_ishtp: Fix a double-unlock issue
    Date
    From: Qiushi Wu <wu000273@umn.edu>

    [ Upstream commit aaa3cbbac326c95308e315f1ab964a3369c4d07d ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/platform/chrome/cros_ec_ishtp.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/platform/chrome/cros_ec_ishtp.c b/drivers/platform/chrome/cros_ec_ishtp.c
    index ed794a7ddba9b..81364029af367 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;

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-08-20 15:45    [W:3.426 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site