summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter2016-07-14 05:18:14 -0500
committerGreg Kroah-Hartman2017-01-26 01:24:44 -0600
commit2a306053176853c785d48dfe27da8d1c544723b5 (patch)
treeb44f88711b14c0416837174a632cfa9ab0b5596c
parentfcdab6ca9c31bc4d2abfa931d9ebde986515dedd (diff)
downloadkernel-omap-2a306053176853c785d48dfe27da8d1c544723b5.tar.gz
kernel-omap-2a306053176853c785d48dfe27da8d1c544723b5.tar.xz
kernel-omap-2a306053176853c785d48dfe27da8d1c544723b5.zip
blackfin: check devm_pinctrl_get() for errors
commit c9205e18b41a6ef5ad73e1c4b86a78b2ea3ccb9b upstream. devm_pinctrl_get() can fail so we should check for that. Fixes: 0a6824bc10de ('[media] v4l2: blackfin: select proper pinctrl state in ppi_set_params if CONFIG_PINCTRL is enabled') Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/media/platform/blackfin/ppi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/blackfin/ppi.c b/drivers/media/platform/blackfin/ppi.c
index cff63e511e6d..b8f3d9fa66e9 100644
--- a/drivers/media/platform/blackfin/ppi.c
+++ b/drivers/media/platform/blackfin/ppi.c
@@ -214,6 +214,8 @@ static int ppi_set_params(struct ppi_if *ppi, struct ppi_params *params)
214 if (params->dlen > 24 || params->dlen <= 0) 214 if (params->dlen > 24 || params->dlen <= 0)
215 return -EINVAL; 215 return -EINVAL;
216 pctrl = devm_pinctrl_get(ppi->dev); 216 pctrl = devm_pinctrl_get(ppi->dev);
217 if (IS_ERR(pctrl))
218 return PTR_ERR(pctrl);
217 pstate = pinctrl_lookup_state(pctrl, 219 pstate = pinctrl_lookup_state(pctrl,
218 pin_state[(params->dlen + 7) / 8 - 1]); 220 pin_state[(params->dlen + 7) / 8 - 1]);
219 if (pinctrl_select_state(pctrl, pstate)) 221 if (pinctrl_select_state(pctrl, pstate))