From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [-next] usb: typec: ucsi: ccg: fix missing unlock on error in ccg_cmd_write_flash_row() From: Heikki Krogerus Message-Id: <20190429121940.GA15384@kuha.fi.intel.com> Date: Mon, 29 Apr 2019 15:19:40 +0300 To: Wei Yongjun Cc: Greg Kroah-Hartman , Ajay Gupta , Wolfram Sang , linux-usb@vger.kernel.org, kernel-janitors@vger.kernel.org List-ID: T24gTW9uLCBBcHIgMjksIDIwMTkgYXQgMTI6MjY6MzBQTSArMDAwMCwgV2VpIFlvbmdqdW4gd3Jv dGU6Cj4gQWRkIHRoZSBtaXNzaW5nIHVubG9jayBiZWZvcmUgcmV0dXJuIGZyb20gZnVuY3Rpb24g Y2NnX2NtZF93cml0ZV9mbGFzaF9yb3coKQo+IGluIHRoZSBlcnJvciBoYW5kbGluZyBjYXNlLgo+ IAo+IEZpeGVzOiA1YzlhZTVhODc1NzMgKCJ1c2I6IHR5cGVjOiB1Y3NpOiBjY2c6IGFkZCBmaXJt d2FyZSBmbGFzaGluZyBzdXBwb3J0IikKPiBTaWduZWQtb2ZmLWJ5OiBXZWkgWW9uZ2p1biA8d2Vp eW9uZ2p1bjFAaHVhd2VpLmNvbT4KCkFja2VkLWJ5OiBIZWlra2kgS3JvZ2VydXMgPGhlaWtraS5r cm9nZXJ1c0BsaW51eC5pbnRlbC5jb20+Cgo+IC0tLQo+ICBkcml2ZXJzL3VzYi90eXBlYy91Y3Np L3Vjc2lfY2NnLmMgfCAxICsKPiAgMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspCj4gCj4g ZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL3R5cGVjL3Vjc2kvdWNzaV9jY2cuYyBiL2RyaXZlcnMv dXNiL3R5cGVjL3Vjc2kvdWNzaV9jY2cuYwo+IGluZGV4IDQ2MzJiOTFhMDRhNi4uOWQ0NmFhOWU0 ZTM1IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvdXNiL3R5cGVjL3Vjc2kvdWNzaV9jY2cuYwo+ICsr KyBiL2RyaXZlcnMvdXNiL3R5cGVjL3Vjc2kvdWNzaV9jY2cuYwo+IEBAIC02MzEsNiArNjMxLDcg QEAgY2NnX2NtZF93cml0ZV9mbGFzaF9yb3coc3RydWN0IHVjc2lfY2NnICp1YywgdTE2IHJvdywK PiAgCXJldCA9IGkyY19tYXN0ZXJfc2VuZChjbGllbnQsIGJ1ZiwgQ0NHNF9ST1dfU0laRSArIDIp Owo+ICAJaWYgKHJldCAhPSBDQ0c0X1JPV19TSVpFICsgMikgewo+ICAJCWRldl9lcnIodWMtPmRl diwgIlJFR19GTEFTSF9SV19NRU0gd3JpdGUgZmFpbCAlZFxuIiwgcmV0KTsKPiArCQltdXRleF91 bmxvY2soJnVjLT5sb2NrKTsKPiAgCQlyZXR1cm4gcmV0IDwgMCA/IHJldCA6IC1FSU87Cj4gIAl9 Cj4gCj4gCgp0aGFua3MsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC17BC43219 for ; Mon, 29 Apr 2019 12:19:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 80E7620578 for ; Mon, 29 Apr 2019 12:19:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728003AbfD2MTp (ORCPT ); Mon, 29 Apr 2019 08:19:45 -0400 Received: from mga18.intel.com ([134.134.136.126]:10309 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727710AbfD2MTo (ORCPT ); Mon, 29 Apr 2019 08:19:44 -0400 X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Apr 2019 05:19:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,409,1549958400"; d="scan'208";a="168933063" Received: from kuha.fi.intel.com ([10.237.72.189]) by fmsmga001.fm.intel.com with SMTP; 29 Apr 2019 05:19:41 -0700 Received: by kuha.fi.intel.com (sSMTP sendmail emulation); Mon, 29 Apr 2019 15:19:40 +0300 Date: Mon, 29 Apr 2019 15:19:40 +0300 From: Heikki Krogerus To: Wei Yongjun Cc: Greg Kroah-Hartman , Ajay Gupta , Wolfram Sang , linux-usb@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH -next] usb: typec: ucsi: ccg: fix missing unlock on error in ccg_cmd_write_flash_row() Message-ID: <20190429121940.GA15384@kuha.fi.intel.com> References: <20190429122630.59334-1-weiyongjun1@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline In-Reply-To: <20190429122630.59334-1-weiyongjun1@huawei.com> User-Agent: Mutt/1.11.3 (2019-02-01) Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Message-ID: <20190429121940.2kUol0oCvrFzEbEJZDd0tkqWJD7lInEk268nbU_JL_Q@z> On Mon, Apr 29, 2019 at 12:26:30PM +0000, Wei Yongjun wrote: > Add the missing unlock before return from function ccg_cmd_write_flash_row() > in the error handling case. > > Fixes: 5c9ae5a87573 ("usb: typec: ucsi: ccg: add firmware flashing support") > Signed-off-by: Wei Yongjun Acked-by: Heikki Krogerus > --- > drivers/usb/typec/ucsi/ucsi_ccg.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c > index 4632b91a04a6..9d46aa9e4e35 100644 > --- a/drivers/usb/typec/ucsi/ucsi_ccg.c > +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c > @@ -631,6 +631,7 @@ ccg_cmd_write_flash_row(struct ucsi_ccg *uc, u16 row, > ret = i2c_master_send(client, buf, CCG4_ROW_SIZE + 2); > if (ret != CCG4_ROW_SIZE + 2) { > dev_err(uc->dev, "REG_FLASH_RW_MEM write fail %d\n", ret); > + mutex_unlock(&uc->lock); > return ret < 0 ? ret : -EIO; > } > > thanks, -- heikki