media: Revert "media: exynos4-is: Add missed check for pinctrl_lookup_state()"
authorSylwester Nawrocki <s.nawrocki@samsung.com>
Mon, 10 Aug 2020 15:32:39 +0000 (17:32 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Sat, 29 Aug 2020 06:19:33 +0000 (08:19 +0200)
The "idle" pinctrl state is optional as documented in the DT binding.
The change introduced by the commit being reverted makes that pinctrl state
mandatory and breaks initialization of the whole media driver, since the
"idle" state is not specified in any mainline dts.

This reverts commit 18ffec750578 ("media: exynos4-is: Add missed check for pinctrl_lookup_state()")
to fix the regression.

Fixes: 18ffec750578 ("media: exynos4-is: Add missed check for pinctrl_lookup_state()")
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/platform/exynos4-is/media-dev.c

index 16dd660137a8d9339bcd42bf60e76a729047db97..9a575233e4c1e2958ee0b17f1c1022ff6a4c3f39 100644 (file)
@@ -1268,11 +1268,9 @@ static int fimc_md_get_pinctrl(struct fimc_md *fmd)
        if (IS_ERR(pctl->state_default))
                return PTR_ERR(pctl->state_default);
 
+       /* PINCTRL_STATE_IDLE is optional */
        pctl->state_idle = pinctrl_lookup_state(pctl->pinctrl,
                                        PINCTRL_STATE_IDLE);
-       if (IS_ERR(pctl->state_idle))
-               return PTR_ERR(pctl->state_idle);
-
        return 0;
 }