From 044afbd6a35c384cac0c6b13a2bd20470f73990f Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Tue, 29 Jan 2019 16:57:40 +0800 Subject: [PATCH] media: rockchip: isp1: add check for get_remote_sensor Change-Id: Ic09b394daa96aa8227b327f1e59713a359be8c18 Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp1/rkisp1.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/isp1/rkisp1.c b/drivers/media/platform/rockchip/isp1/rkisp1.c index 1f70057e122d..e020f3ed0444 100644 --- a/drivers/media/platform/rockchip/isp1/rkisp1.c +++ b/drivers/media/platform/rockchip/isp1/rkisp1.c @@ -83,11 +83,17 @@ static inline struct rkisp1_device *sd_to_isp_dev(struct v4l2_subdev *sd) /* Get sensor by enabled media link */ static struct v4l2_subdev *get_remote_sensor(struct v4l2_subdev *sd) { - struct media_pad *local; + struct media_pad *local, *remote; struct media_entity *sensor_me; local = &sd->entity.pads[RKISP1_ISP_PAD_SINK]; - sensor_me = media_entity_remote_pad(local)->entity; + if (!local) + return NULL; + remote = media_entity_remote_pad(local); + if (!remote) + return NULL; + + sensor_me = remote->entity; return media_entity_to_v4l2_subdev(sensor_me); }