4.18-stable patches

added patches:
	asoc-wm8994-fix-missing-break-in-switch.patch
	hid-redragon-fix-num-lock-and-caps-lock-leds.patch

diff --git a/queue-4.18/asoc-wm8994-fix-missing-break-in-switch.patch b/queue-4.18/asoc-wm8994-fix-missing-break-in-switch.patch
new file mode 100644 (file)
index 0000000..803deb7
--- /dev/null
+++ b/queue-4.18/asoc-wm8994-fix-missing-break-in-switch.patch
@@ -0,0 +1,35 @@
+From ad0eaee6195db1db1749dd46b9e6f4466793d178 Mon Sep 17 00:00:00 2001
+From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
+Date: Mon, 6 Aug 2018 07:14:51 -0500
+Subject: ASoC: wm8994: Fix missing break in switch
+
+From: Gustavo A. R. Silva <gustavo@embeddedor.com>
+
+commit ad0eaee6195db1db1749dd46b9e6f4466793d178 upstream.
+
+Add missing break statement in order to prevent the code from falling
+through to the default case.
+
+Addresses-Coverity-ID: 115050 ("Missing break in switch")
+Reported-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
+Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Cc: stable@vger.kernel.org
+[Gustavo: Backported to 3.16..4.18 - Remove code comment removal]
+Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/soc/codecs/wm8994.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/soc/codecs/wm8994.c
++++ b/sound/soc/codecs/wm8994.c
+@@ -2432,6 +2432,7 @@ static int wm8994_set_dai_sysclk(struct
+                       snd_soc_component_update_bits(component, WM8994_POWER_MANAGEMENT_2,
+                                           WM8994_OPCLK_ENA, 0);
+               }
++              break;
+ 
+       default:
+               return -EINVAL;

diff --git a/queue-4.18/hid-redragon-fix-num-lock-and-caps-lock-leds.patch b/queue-4.18/hid-redragon-fix-num-lock-and-caps-lock-leds.patch
new file mode 100644 (file)
index 0000000..384097f
--- /dev/null
+++ b/queue-4.18/hid-redragon-fix-num-lock-and-caps-lock-leds.patch
@@ -0,0 +1,69 @@
+From dc9b8e85ed95cbe7e3ad0eabb5b48d617bbc365e Mon Sep 17 00:00:00 2001
+From: Robert Munteanu <rombert@apache.org>
+Date: Tue, 19 Jun 2018 11:20:40 +0300
+Subject: HID: redragon: fix num lock and caps lock LEDs
+
+From: Robert Munteanu <rombert@apache.org>
+
+commit dc9b8e85ed95cbe7e3ad0eabb5b48d617bbc365e upstream.
+
+The redragon asura keyboard registers two input devices. The initial commit
+85455dd906d5 ("HID: redragon: Fix modifier keys for Redragon Asura Keyboard")
+considered this an error and prevented one of the devices from registering.
+However, once this is done the num lock and caps lock leds no longer toggle on
+and off, although the key functionality is not affected.
+
+This commit removes the code that prevents the input device
+registration and restores the num lock and caps lock LEDs.
+
+Fixes: 85455dd906d5 ("HID: redragon: Fix modifier keys for Redragon Asura Keyboard")
+Signed-off-by: Robert Munteanu <rombert@apache.org>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hid/hid-redragon.c |   26 +-------------------------
+ 1 file changed, 1 insertion(+), 25 deletions(-)
+
+--- a/drivers/hid/hid-redragon.c
++++ b/drivers/hid/hid-redragon.c
+@@ -44,29 +44,6 @@ static __u8 *redragon_report_fixup(struc
+       return rdesc;
+ }
+ 
+-static int redragon_probe(struct hid_device *dev,
+-      const struct hid_device_id *id)
+-{
+-      int ret;
+-
+-      ret = hid_parse(dev);
+-      if (ret) {
+-              hid_err(dev, "parse failed\n");
+-              return ret;
+-      }
+-
+-      /* do not register unused input device */
+-      if (dev->maxapplication == 1)
+-              return 0;
+-
+-      ret = hid_hw_start(dev, HID_CONNECT_DEFAULT);
+-      if (ret) {
+-              hid_err(dev, "hw start failed\n");
+-              return ret;
+-      }
+-
+-      return 0;
+-}
+ static const struct hid_device_id redragon_devices[] = {
+       {HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_REDRAGON_ASURA)},
+       {}
+@@ -77,8 +54,7 @@ MODULE_DEVICE_TABLE(hid, redragon_device
+ static struct hid_driver redragon_driver = {
+       .name = "redragon",
+       .id_table = redragon_devices,
+-      .report_fixup = redragon_report_fixup,
+-      .probe = redragon_probe
++      .report_fixup = redragon_report_fixup
+ };
+ 
+ module_hid_driver(redragon_driver);

diff --git a/queue-4.18/series b/queue-4.18/series
index 06bc2fcda3681abb68b329cd0a9af87eb6e47351..46e11a4a075df8069180cf663c644ad0b0f7b5a4 100644 (file)
--- a/queue-4.18/series
+++ b/queue-4.18/series
@@ -193,3 +193,5 @@ x86-xen-don-t-write-ptes-directly-in-32-bit-pv-guests.patch
 kbuild-make-missing-depmod-a-warning-instead-of-an-error.patch
 kvm-x86-set-highest-physical-address-bits-in-non-present-reserved-sptes.patch
 x86-kvm-avoid-unused-variable-warning.patch
+hid-redragon-fix-num-lock-and-caps-lock-leds.patch
+asoc-wm8994-fix-missing-break-in-switch.patch