4.19-stable patches

added patches:
	usb-charger-assign-specific-number-for-enum-value.patch

diff --git a/queue-4.19/series b/queue-4.19/series
index a99d68a110a792e772d864393482b6667aacfb14..a69615a768bc479a8730e7949b8fc5d39366e218 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -57,3 +57,4 @@ i2c-jz4780-silence-log-flood-on-txabrt.patch
 drm-i915-gvt-fix-orphan-vgpu-dmabuf_objs-lifetime.patch
 drm-i915-gvt-separate-display-reset-from-all_engines-reset.patch
 hv_netvsc-fix-unwanted-wakeup-in-netvsc_attach.patch
+usb-charger-assign-specific-number-for-enum-value.patch

diff --git a/queue-4.19/usb-charger-assign-specific-number-for-enum-value.patch b/queue-4.19/usb-charger-assign-specific-number-for-enum-value.patch
new file mode 100644 (file)
index 0000000..7f89988
--- /dev/null
+++ b/queue-4.19/usb-charger-assign-specific-number-for-enum-value.patch
@@ -0,0 +1,51 @@
+From ca4b43c14cd88d28cfc6467d2fa075aad6818f1d Mon Sep 17 00:00:00 2001
+From: Peter Chen <peter.chen@nxp.com>
+Date: Sat, 1 Feb 2020 14:13:44 +0800
+Subject: usb: charger: assign specific number for enum value
+
+From: Peter Chen <peter.chen@nxp.com>
+
+commit ca4b43c14cd88d28cfc6467d2fa075aad6818f1d upstream.
+
+To work properly on every architectures and compilers, the enum value
+needs to be specific numbers.
+
+Suggested-by: Greg KH <gregkh@linuxfoundation.org>
+Signed-off-by: Peter Chen <peter.chen@nxp.com>
+Link: https://lore.kernel.org/r/1580537624-10179-1-git-send-email-peter.chen@nxp.com
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/uapi/linux/usb/charger.h |   16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+--- a/include/uapi/linux/usb/charger.h
++++ b/include/uapi/linux/usb/charger.h
+@@ -14,18 +14,18 @@
+  * ACA (Accessory Charger Adapters)
+  */
+ enum usb_charger_type {
+-      UNKNOWN_TYPE,
+-      SDP_TYPE,
+-      DCP_TYPE,
+-      CDP_TYPE,
+-      ACA_TYPE,
++      UNKNOWN_TYPE = 0,
++      SDP_TYPE = 1,
++      DCP_TYPE = 2,
++      CDP_TYPE = 3,
++      ACA_TYPE = 4,
+ };
+ 
+ /* USB charger state */
+ enum usb_charger_state {
+-      USB_CHARGER_DEFAULT,
+-      USB_CHARGER_PRESENT,
+-      USB_CHARGER_ABSENT,
++      USB_CHARGER_DEFAULT = 0,
++      USB_CHARGER_PRESENT = 1,
++      USB_CHARGER_ABSENT = 2,
+ };
+ 
+ #endif /* _UAPI__LINUX_USB_CHARGER_H */