Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / media / platform / blackfin / ppi.c

diff --git a/drivers/media/platform/blackfin/ppi.c b/drivers/media/platform/blackfin/ppi.c
index cff63e511e6d9a99434deb6a2d776058018eb34e..b8f3d9fa66e907ca54c0e61972c5c2bbacfad2b5 100644 (file)
--- 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)
        if (params->dlen > 24 || params->dlen <= 0)
                return -EINVAL;
        pctrl = devm_pinctrl_get(ppi->dev);
+       if (IS_ERR(pctrl))
+               return PTR_ERR(pctrl);
        pstate = pinctrl_lookup_state(pctrl,
                                      pin_state[(params->dlen + 7) / 8 - 1]);
        if (pinctrl_select_state(pctrl, pstate))