提交 a1f51d37 编写于 作者: J Jonathan Bakker 提交者: Mauro Carvalho Chehab

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

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: NJonathan Bakker <xc-racer2@live.ca>
Reviewed-by: NSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: NHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: NMauro Carvalho Chehab <mchehab+huawei@kernel.org>
上级 55400d77
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册