From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 19 Mar 2015 13:19:54 +0000 (+0100)
Subject: 3.14-stable patches
X-Git-Tag: v3.19.3~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9df1f93200089b8bf0279798a39c4dbb88574a50;p=thirdparty%2Fkernel%2Fstable-queue.git

3.14-stable patches

added patches:
	iio-mxs-lradc-fix-merge-error.patch
---

diff --git a/queue-3.14/iio-mxs-lradc-fix-merge-error.patch b/queue-3.14/iio-mxs-lradc-fix-merge-error.patch
new file mode 100644
index 00000000000..333757b20a6
--- /dev/null
+++ b/queue-3.14/iio-mxs-lradc-fix-merge-error.patch
@@ -0,0 +1,29 @@
+From foo@baz Thu Mar 19 14:17:42 CET 2015
+Date: Thu, 19 Mar 2015 14:17:42 +0100
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: iio: mxs-lradc: fix merge error
+
+Commit e7f3db14eacaf1993a70b1517582603dfdf34988 (89bb35e200bee745c539a96666e0792301ca40f1 upstream) was backported incorrectly by me, so fix it up, as the driver is now broken.
+
+Sorry about that.
+
+Reported-by: Kristina Martšenko <kristina.martsenko@gmail.com>
+Cc: Marek Vasut <marex@denx.de>
+Cc: Jonathan Cameron <jic23@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/staging/iio/adc/mxs-lradc.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/staging/iio/adc/mxs-lradc.c
++++ b/drivers/staging/iio/adc/mxs-lradc.c
+@@ -1159,7 +1159,6 @@ static irqreturn_t mxs_lradc_handle_irq(
+ 				LRADC_CTRL1_LRADC_IRQ(TOUCHSCREEN_VCHANNEL2));
+ 	}
+ 
+-	if (iio_buffer_enabled(iio))
+ 	if (iio_buffer_enabled(iio)) {
+ 		if (reg & lradc->buffer_vchans)
+ 			iio_trigger_poll(iio->trig, iio_get_time_ns());
diff --git a/queue-3.14/series b/queue-3.14/series
new file mode 100644
index 00000000000..a39034427e9
--- /dev/null
+++ b/queue-3.14/series
@@ -0,0 +1 @@
+iio-mxs-lradc-fix-merge-error.patch