mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 16:49:22 +00:00
Code Issues Releases Wiki Activity

media: exynos4-is: Fix nullptr when no CSIS device present

Browse source 
Not all devices use the CSIS device, some may use the FIMC directly in
which case the CSIS device isn't registered.  This leads to a nullptr
exception when starting the stream as the CSIS device is always
referenced.  Instead, if getting the CSIS device fails, try getting the
FIMC directly to check if we are using the subdev API

Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
Reviewed-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>
This commit is contained in:
Jonathan Bakker 2020-07-31 01:01:06 +02:00 committed by Mauro Carvalho Chehab
parent 55400d7745
commit a1f51d3732
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/media/platform/exynos4-is/media-dev.c
View file

@ -290,11 +290,26 @@ static int __fimc_pipeline_s_stream(struct exynos_media_pipeline *ep, bool on)
{ IDX_CSIS, IDX_FLITE, IDX_FIMC, IDX_SENSOR, IDX_IS_ISP },
};
struct fimc_pipeline *p = to_fimc_pipeline(ep);
struct fimc_md *fmd = entity_to_fimc_mdev(&p->subdevs[IDX_CSIS]->entity);
enum fimc_subdev_index sd_id;
int i, ret = 0;
if (p->subdevs[IDX_SENSOR] == NULL) {
struct fimc_md *fmd;
struct v4l2_subdev *sd = p->subdevs[IDX_CSIS];
if (!sd)
sd = p->subdevs[IDX_FIMC];
if (!sd) {
/*
* If neither CSIS nor FIMC was set up,
* it's impossible to have any sensors
*/
return -ENODEV;
}
fmd = entity_to_fimc_mdev(&sd->entity);
if (!fmd->user_subdev_api) {
/*
* Sensor must be already discovered if we