Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp442291ybt; Wed, 1 Jul 2020 02:12:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGNuDMmqgDmmu38oeFi9I881nktmSkTzFVlfj2M6W5Z0EJiLNyYlHAmaHG5e7XfSuNM1l7 X-Received: by 2002:a17:907:9c4:: with SMTP id bx4mr22120650ejc.495.1593594732221; Wed, 01 Jul 2020 02:12:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593594732; cv=none; d=google.com; s=arc-20160816; b=fK7Nx2wV0bG2mytJtQifcSSSCyxqcyyoQcdbeIY1wCid03WQ6XyqUXVtsIv3+isE0r XiWtGwgG3aBIUlUiXRP1GfX6Ij59iPemGTRH0MMyfVGpcf6+9P+jzQ7HUNV49f6G9l5u T69vpZMiVvCaFGxosJF0iyz8G9w+pgC9U4tP1GR1AUAKFUsdqAVEkbJRUM30KbYZFQMW VvQtohGSyqkH5o5kUwWw5TSnXJdcF/hWbr23OtKaSLBS/N+8gwXbmm8bLZiYl+IYX1Ov oVXxkejAhFdFeocVebPjVXswkRTz5nvfqr5C/QH4a/ybG3GGMCkn9Zn9vbxAyEePRVTG 925w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:references:cc:to:subject:from; bh=qa8cEWWOLcrtKcuZPzcj6ebHmZtnrBOqrnXxLNA1M9s=; b=yQjkSNo9feM2teZGvV1US7vs5zBLBfYvA1la6nr5+vOgi2kidORPz5uvtSdx6fxdQY q20yMu/WVQyCZ1LROI5Jez8GJIzUltGQBI+b6iYIWcLJFCD/mZRqJLvM7wMDyMCYwYki /a5Y6TwYgQGtHO2MfUeTk9zrVbaxZWlXxVoHik0vOvvw1ZNLtkJ2FJKMYSEPnUhUNqXL PCNoQ/POaicMJ+IkMHXbBBuTc5WAENEY+jnCwpm/w0sctjC4144zJUOy4+G3PyvfHB+/ W3yViorQAO6rrNqX8cUgr2L965HDNrbZSPuSCBeuJJIhEPPMLDulx/aM6QyZDRnfH1yy maHA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m9si3357924eja.312.2020.07.01.02.11.48; Wed, 01 Jul 2020 02:12:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729402AbgGAJKg (ORCPT + 99 others); Wed, 1 Jul 2020 05:10:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729075AbgGAJKg (ORCPT ); Wed, 1 Jul 2020 05:10:36 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB7B1C061755 for ; Wed, 1 Jul 2020 02:10:35 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: eballetbo) with ESMTPSA id E2BF12A0CAB From: Enric Balletbo i Serra Subject: Re: [PATCH] platform/chrome: fix a double-unlock issue To: wu000273@umn.edu, bleung@chromium.org Cc: groeck@chromium.org, linux-kernel@vger.kernel.org, kjlu@umn.edu References: <20200523031608.17918-1-wu000273@umn.edu> Message-ID: <3ee01d41-fb55-6a08-f041-f885c8b7415d@collabora.com> Date: Wed, 1 Jul 2020 11:10:31 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <20200523031608.17918-1-wu000273@umn.edu> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Qiushi, Thank you for the patch. On 23/5/20 5:16, wu000273@umn.edu wrote: > From: Qiushi Wu > > 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 Applied for 5.9 > --- > 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 93a71e93a2f1..41d60af618c9 100644 > --- a/drivers/platform/chrome/cros_ec_ishtp.c > +++ b/drivers/platform/chrome/cros_ec_ishtp.c > @@ -660,8 +660,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; > >