Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d81bfffb authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Greg Kroah-Hartman
Browse files

media: Revert "media: exynos4-is: Add missed check for pinctrl_lookup_state()" 



[ 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: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d9470165

drivers/media/platform/exynos4-is/media-dev.c

+1 −3
Original line number Diff line number Diff line
@@ -1257,11 +1257,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;

}