| Message ID | 20190429122630.59334-1-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | c2d1812600f5a8c9341b2db7c863cd2725444de5 |
| Headers | show |
| Series | [-next] usb: typec: ucsi: ccg: fix missing unlock on error in ccg_cmd_write_flash_row() | expand |
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 <weiyongjun1@huawei.com> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > 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,
Hi Wei > -----Original Message----- > From: Wei Yongjun <weiyongjun1@huawei.com> > Sent: Monday, April 29, 2019 5:27 AM > To: Heikki Krogerus <heikki.krogerus@linux.intel.com>; Greg Kroah-Hartman > <gregkh@linuxfoundation.org>; Ajay Gupta <ajayg@nvidia.com>; Wolfram Sang > <wsa@the-dreams.de> > Cc: Wei Yongjun <weiyongjun1@huawei.com>; linux-usb@vger.kernel.org; > kernel-janitors@vger.kernel.org > Subject: [PATCH -next] usb: typec: ucsi: ccg: fix missing unlock on error in > ccg_cmd_write_flash_row() > > Add the missing unlock before return from function ccg_cmd_write_flash_row() > in the error handling case. Thanks for fixing this. The change looks good. > nvpublic > > Fixes: 5c9ae5a87573 ("usb: typec: ucsi: ccg: add firmware flashing support") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > 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; > } > >
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; }
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 <weiyongjun1@huawei.com> --- drivers/usb/typec/ucsi/ucsi_ccg.c | 1 + 1 file changed, 1 insertion(+)