* Patch "Input: synaptics-rmi4 - unlock on error" has been added to the 4.9-stable tree
@ 2017-01-09 15:26 gregkh
0 siblings, 0 replies; only message in thread
From: gregkh @ 2017-01-09 15:26 UTC (permalink / raw)
To: dan.carpenter, dmitry.torokhov, gregkh; +Cc: stable, stable-commits
This is a note to let you know that I've just added the patch titled
Input: synaptics-rmi4 - unlock on error
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
input-synaptics-rmi4-unlock-on-error.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From 792f497b22afd0563b94dd8fa129a05f762a2c25 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 16 Nov 2016 17:23:22 -0800
Subject: Input: synaptics-rmi4 - unlock on error
From: Dan Carpenter <dan.carpenter@oracle.com>
commit 792f497b22afd0563b94dd8fa129a05f762a2c25 upstream.
We should unlock before returning on this error path.
Fixes: 3a762dbd5347 ('[media] Input: synaptics-rmi4 - add support for F54 diagnostics')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/input/rmi4/rmi_f54.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/drivers/input/rmi4/rmi_f54.c
+++ b/drivers/input/rmi4/rmi_f54.c
@@ -200,7 +200,7 @@ static int rmi_f54_request_report(struct
error = rmi_write(rmi_dev, fn->fd.command_base_addr, F54_GET_REPORT);
if (error < 0)
- return error;
+ goto unlock;
init_completion(&f54->cmd_done);
@@ -209,9 +209,10 @@ static int rmi_f54_request_report(struct
queue_delayed_work(f54->workqueue, &f54->work, 0);
+unlock:
mutex_unlock(&f54->data_mutex);
- return 0;
+ return error;
}
static size_t rmi_f54_get_report_size(struct f54_data *f54)
Patches currently in stable-queue which might be from dan.carpenter@oracle.com are
queue-4.9/staging-media-davinci_vpfe-unlock-on-error-in-vpfe_reqbufs.patch
queue-4.9/mmc-mmc_test-uninitialized-return-value.patch
queue-4.9/relay-check-array-offset-before-using-it.patch
queue-4.9/target-iscsi-fix-double-free-in-lio_target_tiqn_addtpg.patch
queue-4.9/s390-crypto-unlock-on-error-in-prng_tdes_read.patch
queue-4.9/usb-xhci-mem-use-passed-in-gfp-flags-instead-of-gfp_kernel.patch
queue-4.9/iommu-amd-missing-error-code-in-amd_iommu_init_device.patch
queue-4.9/efi-efivar_ssdt_load-don-t-return-success-on-allocation-failure.patch
queue-4.9/asoc-intel-skylake-fix-a-shift-wrapping-bug.patch
queue-4.9/input-synaptics-rmi4-unlock-on-error.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-01-09 15:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-09 15:26 Patch "Input: synaptics-rmi4 - unlock on error" has been added to the 4.9-stable tree gregkh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.