diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2020-08-10 17:32:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-29 09:03:02 +0100 |
| commit | f6af2c161ba4f21d5ec7f7a8fdaf162625763ac1 (patch) | |
| tree | 7fb0bbee2ac0bb4fea7307867acee91956f31901 | |
| parent | 2c35a3655c36b55226be15e757058672533e6282 (diff) | |
| download | linux-stable-f6af2c161ba4f21d5ec7f7a8fdaf162625763ac1.tar.gz linux-stable-f6af2c161ba4f21d5ec7f7a8fdaf162625763ac1.tar.bz2 linux-stable-f6af2c161ba4f21d5ec7f7a8fdaf162625763ac1.zip | |
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: 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>
| -rw-r--r-- | drivers/media/platform/exynos4-is/media-dev.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c index 31cc7d94064e..6bc3c8a2e144 100644 --- a/drivers/media/platform/exynos4-is/media-dev.c +++ b/drivers/media/platform/exynos4-is/media-dev.c @@ -1170,11 +1170,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; } |