mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-07 11:26:02 +09:00
media: rockchip: fix isp and cif build warning
Change-Id: I6924f6a833679c945fe0469efa07b66b28440edc Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
@@ -717,8 +717,8 @@ static void csi2_notifier_unbind(struct v4l2_async_notifier *notifier,
|
||||
notifier);
|
||||
struct csi2_sensor_info *sensor = sd_to_sensor(csi2, sd);
|
||||
|
||||
sensor->sd = NULL;
|
||||
|
||||
if (sensor)
|
||||
sensor->sd = NULL;
|
||||
}
|
||||
|
||||
static const struct
|
||||
|
||||
@@ -357,6 +357,8 @@ int rkisp_update_sensor_info(struct rkisp_device *dev)
|
||||
return -ENODEV;
|
||||
|
||||
sensor = sd_to_sensor(dev, sensor_sd);
|
||||
if (!sensor)
|
||||
return -ENODEV;
|
||||
ret = v4l2_subdev_call(sensor->sd, pad, get_mbus_config,
|
||||
0, &sensor->mbus);
|
||||
if (ret && ret != -ENOIOCTLCMD)
|
||||
|
||||
@@ -1256,6 +1256,8 @@ static int rkisp1_isp_sd_set_fmt(struct v4l2_subdev *sd,
|
||||
const struct ispsd_in_fmt *in_fmt;
|
||||
|
||||
in_fmt = find_in_fmt(mf->code);
|
||||
if (!in_fmt)
|
||||
goto err;
|
||||
isp_sd->in_fmt = *in_fmt;
|
||||
isp_sd->in_frm = *mf;
|
||||
} else if (fmt->pad == RKISP1_ISP_PAD_SOURCE_PATH) {
|
||||
@@ -1263,6 +1265,8 @@ static int rkisp1_isp_sd_set_fmt(struct v4l2_subdev *sd,
|
||||
|
||||
/* Ignore width/height */
|
||||
out_fmt = find_out_fmt(mf->code);
|
||||
if (!out_fmt)
|
||||
goto err;
|
||||
isp_sd->out_fmt = *out_fmt;
|
||||
/*
|
||||
* It is quantization for output,
|
||||
|
||||
Reference in New Issue
Block a user