From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 28 Aug 2017 04:27:33 +0000 (+0200)
Subject: 3.18-stable patches
X-Git-Tag: v3.18.68~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff8a34df09fa9b57da0556bb474b737826653435;p=thirdparty%2Fkernel%2Fstable-queue.git

3.18-stable patches

added patches:
	iio-imu-adis16480-fix-acceleration-scale-factor-for-adis16480.patch
	staging-rtl8188eu-add-rnx-n150nub-support.patch
---

diff --git a/queue-3.18/iio-imu-adis16480-fix-acceleration-scale-factor-for-adis16480.patch b/queue-3.18/iio-imu-adis16480-fix-acceleration-scale-factor-for-adis16480.patch
new file mode 100644
index 00000000000..bd8d28e001a
--- /dev/null
+++ b/queue-3.18/iio-imu-adis16480-fix-acceleration-scale-factor-for-adis16480.patch
@@ -0,0 +1,32 @@
+From fdd0d32eb95f135041236a6885d9006315aa9a1d Mon Sep 17 00:00:00 2001
+From: Dragos Bogdan <dragos.bogdan@analog.com>
+Date: Fri, 4 Aug 2017 01:37:27 +0300
+Subject: iio: imu: adis16480: Fix acceleration scale factor for adis16480
+
+From: Dragos Bogdan <dragos.bogdan@analog.com>
+
+commit fdd0d32eb95f135041236a6885d9006315aa9a1d upstream.
+
+According to the datasheet, the range of the acceleration is [-10 g, + 10 g],
+so the scale factor should be 10 instead of 5.
+
+Signed-off-by: Dragos Bogdan <dragos.bogdan@analog.com>
+Acked-by: Lars-Peter Clausen <lars@metafoo.de>
+Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/iio/imu/adis16480.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/iio/imu/adis16480.c
++++ b/drivers/iio/imu/adis16480.c
+@@ -696,7 +696,7 @@ static const struct adis16480_chip_info
+ 		.gyro_max_val = IIO_RAD_TO_DEGREE(22500),
+ 		.gyro_max_scale = 450,
+ 		.accel_max_val = IIO_M_S_2_TO_G(12500),
+-		.accel_max_scale = 5,
++		.accel_max_scale = 10,
+ 	},
+ 	[ADIS16485] = {
+ 		.channels = adis16485_channels,
diff --git a/queue-3.18/series b/queue-3.18/series
index 506cb81e7e3..9a132045c7a 100644
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -17,3 +17,5 @@ perf-core-fix-group-cpu-task-validation.patch
 bluetooth-hidp-fix-possible-might-sleep-error-in-hidp_session_thread.patch
 bluetooth-cmtp-fix-possible-might-sleep-error-in-cmtp_session.patch
 bluetooth-bnep-fix-possible-might-sleep-error-in-bnep_session.patch
+iio-imu-adis16480-fix-acceleration-scale-factor-for-adis16480.patch
+staging-rtl8188eu-add-rnx-n150nub-support.patch
diff --git a/queue-3.18/staging-rtl8188eu-add-rnx-n150nub-support.patch b/queue-3.18/staging-rtl8188eu-add-rnx-n150nub-support.patch
new file mode 100644
index 00000000000..4a4752d6389
--- /dev/null
+++ b/queue-3.18/staging-rtl8188eu-add-rnx-n150nub-support.patch
@@ -0,0 +1,29 @@
+From f299aec6ebd747298e35934cff7709c6b119ca52 Mon Sep 17 00:00:00 2001
+From: Charles Milette <charlesmilette@gmail.com>
+Date: Fri, 18 Aug 2017 16:30:34 -0400
+Subject: staging: rtl8188eu: add RNX-N150NUB support
+
+From: Charles Milette <charlesmilette@gmail.com>
+
+commit f299aec6ebd747298e35934cff7709c6b119ca52 upstream.
+
+Add support for USB Device Rosewill RNX-N150NUB.
+VendorID: 0x0bda, ProductID: 0xffef
+
+Signed-off-by: Charles Milette <charles.milette@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/staging/rtl8188eu/os_dep/usb_intf.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
++++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+@@ -50,6 +50,7 @@ static struct usb_device_id rtw_usb_id_t
+ 	{USB_DEVICE(0x2001, 0x3311)}, /* DLink GO-USB-N150 REV B1 */
+ 	{USB_DEVICE(0x2357, 0x010c)}, /* TP-Link TL-WN722N v2 */
+ 	{USB_DEVICE(0x0df6, 0x0076)}, /* Sitecom N150 v2 */
++	{USB_DEVICE(USB_VENDER_ID_REALTEK, 0xffef)}, /* Rosewill RNX-N150NUB */
+ 	{}	/* Terminating entry */
+ };
+