| Message ID | 1473776690-3748-1-git-send-email-weiyj.lk@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Sep 13, 2016 at 02:24:50PM +0000, Wei Yongjun wrote: > Add the missing unlock before return from function > rmi_f54_request_report() in the error handling case. > > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Acked-by: Nick Dyer <nick@shmanahar.org> > --- > drivers/input/rmi4/rmi_f54.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/input/rmi4/rmi_f54.c b/drivers/input/rmi4/rmi_f54.c > index bd86d3d..99a8836 100644 > --- a/drivers/input/rmi4/rmi_f54.c > +++ b/drivers/input/rmi4/rmi_f54.c > @@ -198,8 +198,10 @@ static int rmi_f54_request_report(struct rmi_function *fn, u8 report_type) > mutex_lock(&f54->data_mutex); > > error = rmi_write(rmi_dev, fn->fd.command_base_addr, F54_GET_REPORT); > - if (error < 0) > + if (error < 0) { > + mutex_unlock(&f54->data_mutex); > return error; > + } > > init_completion(&f54->cmd_done); > -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/rmi4/rmi_f54.c b/drivers/input/rmi4/rmi_f54.c index bd86d3d..99a8836 100644 --- a/drivers/input/rmi4/rmi_f54.c +++ b/drivers/input/rmi4/rmi_f54.c @@ -198,8 +198,10 @@ static int rmi_f54_request_report(struct rmi_function *fn, u8 report_type) mutex_lock(&f54->data_mutex); error = rmi_write(rmi_dev, fn->fd.command_base_addr, F54_GET_REPORT); - if (error < 0) + if (error < 0) { + mutex_unlock(&f54->data_mutex); return error; + } init_completion(&f54->cmd_done);