Skip to content

Commit

Permalink
Merge tag 'soc-fsl-fix-v5.1' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history
…rnel/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 <[email protected]>
  • Loading branch information
olofj committed May 16, 2019
2 parents c32beba + 5674a92 commit 9e3bf9c
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/soc/fsl/qe/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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__);
Expand Down

0 comments on commit 9e3bf9c

Please sign in to comment.