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: "weiyongjun \(A\)" Message-Id: <20190429122630.59334-1-weiyongjun1@huawei.com> Date: Mon, 29 Apr 2019 12:26:30 +0000 To: Heikki Krogerus , Greg Kroah-Hartman , Ajay Gupta , Wolfram Sang Cc: Wei Yongjun , linux-usb@vger.kernel.org, kernel-janitors@vger.kernel.org List-ID: QWRkIHRoZSBtaXNzaW5nIHVubG9jayBiZWZvcmUgcmV0dXJuIGZyb20gZnVuY3Rpb24gY2NnX2Nt ZF93cml0ZV9mbGFzaF9yb3coKQppbiB0aGUgZXJyb3IgaGFuZGxpbmcgY2FzZS4KCkZpeGVzOiA1 YzlhZTVhODc1NzMgKCJ1c2I6IHR5cGVjOiB1Y3NpOiBjY2c6IGFkZCBmaXJtd2FyZSBmbGFzaGlu ZyBzdXBwb3J0IikKU2lnbmVkLW9mZi1ieTogV2VpIFlvbmdqdW4gPHdlaXlvbmdqdW4xQGh1YXdl aS5jb20+Ci0tLQogZHJpdmVycy91c2IvdHlwZWMvdWNzaS91Y3NpX2NjZy5jIHwgMSArCiAxIGZp bGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi90eXBl Yy91Y3NpL3Vjc2lfY2NnLmMgYi9kcml2ZXJzL3VzYi90eXBlYy91Y3NpL3Vjc2lfY2NnLmMKaW5k ZXggNDYzMmI5MWEwNGE2Li45ZDQ2YWE5ZTRlMzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL3R5 cGVjL3Vjc2kvdWNzaV9jY2cuYworKysgYi9kcml2ZXJzL3VzYi90eXBlYy91Y3NpL3Vjc2lfY2Nn LmMKQEAgLTYzMSw2ICs2MzEsNyBAQCBjY2dfY21kX3dyaXRlX2ZsYXNoX3JvdyhzdHJ1Y3QgdWNz aV9jY2cgKnVjLCB1MTYgcm93LAogCXJldCA9IGkyY19tYXN0ZXJfc2VuZChjbGllbnQsIGJ1Ziwg Q0NHNF9ST1dfU0laRSArIDIpOwogCWlmIChyZXQgIT0gQ0NHNF9ST1dfU0laRSArIDIpIHsKIAkJ ZGV2X2Vycih1Yy0+ZGV2LCAiUkVHX0ZMQVNIX1JXX01FTSB3cml0ZSBmYWlsICVkXG4iLCByZXQp OworCQltdXRleF91bmxvY2soJnVjLT5sb2NrKTsKIAkJcmV0dXJuIHJldCA8IDAgPyByZXQgOiAt RUlPOwogCX0KCg== 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.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 077BFC43219 for ; Mon, 29 Apr 2019 12:16:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D71AA2075E for ; Mon, 29 Apr 2019 12:16:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728002AbfD2MQm (ORCPT ); Mon, 29 Apr 2019 08:16:42 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:7140 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727956AbfD2MQm (ORCPT ); Mon, 29 Apr 2019 08:16:42 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id E5B03775C5A6F9D27CCD; Mon, 29 Apr 2019 20:16:37 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.439.0; Mon, 29 Apr 2019 20:16:28 +0800 From: Wei Yongjun To: Heikki Krogerus , Greg Kroah-Hartman , Ajay Gupta , Wolfram Sang CC: Wei Yongjun , , Subject: [PATCH -next] usb: typec: ucsi: ccg: fix missing unlock on error in ccg_cmd_write_flash_row() Date: Mon, 29 Apr 2019 12:26:30 +0000 Message-ID: <20190429122630.59334-1-weiyongjun1@huawei.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7BIT X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Message-ID: <20190429122630.CkaY0LCCLXzD6dl7_ET-_mo6Qr4ktZTwpCgjVH7eL6w@z> 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 --- 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; }