From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 26 Mar 2019 02:30:58 +0000 (+0900)
Subject: 4.19-stable patches
X-Git-Tag: v4.9.166~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a10963c85e58c90949afd4867a3853ec099dc53;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	power-supply-charger-manager-fix-incorrect-return-value.patch
---

diff --git a/queue-4.19/power-supply-charger-manager-fix-incorrect-return-value.patch b/queue-4.19/power-supply-charger-manager-fix-incorrect-return-value.patch
new file mode 100644
index 00000000000..af6dce9a1ad
--- /dev/null
+++ b/queue-4.19/power-supply-charger-manager-fix-incorrect-return-value.patch
@@ -0,0 +1,38 @@
+From f25a646fbe2051527ad9721853e892d13a99199e Mon Sep 17 00:00:00 2001
+From: Baolin Wang <baolin.wang@linaro.org>
+Date: Fri, 16 Nov 2018 19:01:10 +0800
+Subject: power: supply: charger-manager: Fix incorrect return value
+
+From: Baolin Wang <baolin.wang@linaro.org>
+
+commit f25a646fbe2051527ad9721853e892d13a99199e upstream.
+
+Fix incorrect return value.
+
+Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
+Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/power/supply/charger-manager.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/drivers/power/supply/charger-manager.c
++++ b/drivers/power/supply/charger-manager.c
+@@ -1212,7 +1212,6 @@ static int charger_extcon_init(struct ch
+ 	if (ret < 0) {
+ 		pr_info("Cannot register extcon_dev for %s(cable: %s)\n",
+ 			cable->extcon_name, cable->name);
+-		ret = -EINVAL;
+ 	}
+ 
+ 	return ret;
+@@ -1633,7 +1632,7 @@ static int charger_manager_probe(struct
+ 
+ 	if (IS_ERR(desc)) {
+ 		dev_err(&pdev->dev, "No platform data (desc) found\n");
+-		return -ENODEV;
++		return PTR_ERR(desc);
+ 	}
+ 
+ 	cm = devm_kzalloc(&pdev->dev, sizeof(*cm), GFP_KERNEL);
diff --git a/queue-4.19/series b/queue-4.19/series
index 53a12722ac1..491028bd21c 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -42,3 +42,4 @@ locking-lockdep-add-debug_locks-check-in-__lock_downgrade.patch
 mm-mempolicy-fix-uninit-memory-access.patch
 alsa-hda-record-the-current-power-state-before-suspend-resume-calls.patch
 alsa-hda-enforces-runtime_resume-after-s3-and-s4-for-each-codec.patch
+power-supply-charger-manager-fix-incorrect-return-value.patch