diff options
| author | Olof Johansson <olof@lixom.net> | 2019-05-15 23:24:23 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-05-16 10:53:28 -0700 |
| commit | 9e3bf9cdc703bed5093dc014e6a0e50b36c31058 (patch) | |
| tree | d0aeef35775d78054560a5e09a14056e55ae7121 /drivers/soc | |
| parent | c32beba325d8c54d8affa158a0a54643ba87eab4 (diff) | |
| parent | 5674a92ca4b7e5a6a19231edd10298d30324cd27 (diff) | |
Merge tag 'soc-fsl-fix-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/late
NXP/FSL soc driver fixes for v5.1
QE drivers
- Fix an error path in qe_pin_request()
* tag 'soc-fsl-fix-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux:
soc/fsl/qe: Fix an error code in qe_pin_request()
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/fsl/qe/gpio.c | 4 |
1 files changed, 3 insertions, 1 deletions
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__); |