]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Oct 2020 09:07:18 +0000 (10:07 +0100)
[ Upstream commit 00d21f325d58567d81d9172096692d0a9ea7f725 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/exynos4-is/media-dev.c

index 9c31d950cddf78a3c76e67fb9fec51f8104e5237..2f90607c3797d2ecfaa6edb81415f242adaae5b9 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;
 }