From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 3 Mar 2020 06:44:36 +0000 (+0100)
Subject: 5.5-stable patches
X-Git-Tag: v4.19.108~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a80b9835941ddab80878415714b3e53ebd0126b;p=thirdparty%2Fkernel%2Fstable-queue.git

5.5-stable patches

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

diff --git a/queue-5.5/series b/queue-5.5/series
index 737dd64b6b1..0bfd9727141 100644
--- a/queue-5.5/series
+++ b/queue-5.5/series
@@ -119,3 +119,4 @@ nl80211-fix-potential-leak-in-ap-start.patch
 mac80211-remove-a-redundant-mutex-unlock.patch
 kbuild-fix-dt-binding-schema-rule-to-detect-command-line-changes.patch
 hv_netvsc-fix-unwanted-wakeup-in-netvsc_attach.patch
+usb-charger-assign-specific-number-for-enum-value.patch
diff --git a/queue-5.5/usb-charger-assign-specific-number-for-enum-value.patch b/queue-5.5/usb-charger-assign-specific-number-for-enum-value.patch
new file mode 100644
index 00000000000..7f89988ad3b
--- /dev/null
+++ b/queue-5.5/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 */