Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-05-21 08:05:28 +0200
committerTakashi Iwai <tiwai@suse.de>2019-05-21 08:05:29 +0200
commit8d1ceda678f8c207b2c68bad936eb45de6556584 (patch)
treee6314432a7588aa75db4332e4170c38d3bef2baf
parent294aea5a85cb48ef8d7672d49d9df88f61c24bc1 (diff)
soc/fsl/qe: Fix an error code in qe_pin_request() (bsc#1051510).
-rw-r--r--patches.drivers/soc-fsl-qe-Fix-an-error-code-in-qe_pin_request.patch38
-rw-r--r--series.conf1
2 files changed, 39 insertions, 0 deletions
diff --git a/patches.drivers/soc-fsl-qe-Fix-an-error-code-in-qe_pin_request.patch b/patches.drivers/soc-fsl-qe-Fix-an-error-code-in-qe_pin_request.patch
new file mode 100644
index 0000000000..386aed57b4
--- /dev/null
+++ b/patches.drivers/soc-fsl-qe-Fix-an-error-code-in-qe_pin_request.patch
@@ -0,0 +1,38 @@
+From 5674a92ca4b7e5a6a19231edd10298d30324cd27 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Thu, 28 Mar 2019 17:18:41 +0300
+Subject: [PATCH] soc/fsl/qe: Fix an error code in qe_pin_request()
+Git-commit: 5674a92ca4b7e5a6a19231edd10298d30324cd27
+Patch-mainline: v5.2-rc1
+References: bsc#1051510
+
+We forgot to set "err" on this error path.
+
+Fixes: 1a2d397a6eb5 ("gpio/powerpc: Eliminate duplication of of_get_named_gpio_flags()")
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Signed-off-by: Li Yang <leoyang.li@nxp.com>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/soc/fsl/qe/gpio.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/soc/fsl/qe/gpio.c b/drivers/soc/fsl/qe/gpio.c
+index 819bed0f5667..51b3a47b5a55 100644
+--- a/drivers/soc/fsl/qe/gpio.c
++++ b/drivers/soc/fsl/qe/gpio.c
+@@ -179,8 +179,10 @@ struct qe_pin *qe_pin_request(struct device_node *np, int index)
+ if (err < 0)
+ goto err0;
+ gc = gpio_to_chip(err);
+- if (WARN_ON(!gc))
++ if (WARN_ON(!gc)) {
++ err = -ENODEV;
+ goto err0;
++ }
+
+ if (!of_device_is_compatible(gc->of_node, "fsl,mpc8323-qe-pario-bank")) {
+ pr_debug("%s: tried to get a non-qe pin\n", __func__);
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index e17a490f2f..0267a5ff35 100644
--- a/series.conf
+++ b/series.conf
@@ -22057,6 +22057,7 @@
patches.drivers/ALSA-hda-realtek-Avoid-superfluous-COEF-EAPD-setups.patch
patches.drivers/ALSA-hda-realtek-Corrected-fixup-for-System76-Gazell.patch
patches.drivers/ALSA-hda-realtek-Fix-for-Lenovo-B50-70-inverted-inte.patch
+ patches.drivers/soc-fsl-qe-Fix-an-error-code-in-qe_pin_request.patch
# dhowells/linux-fs keys-uefi
patches.suse/0001-KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch