提交 f4ad8d74 编写于 作者: L Lad, Prabhakar 提交者: Mauro Carvalho Chehab

[media] media: davinci: vpif: add check for NULL handler

for da850/omap-l138, there is no need to setup_input_channel_mode()
and set_clock(), to avoid adding dummy code in board file just returning
zero add a check in the driver itself to call the handler only if its
not NULL.
Signed-off-by: NLad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: NManjunath Hadli <manjunath.hadli@ti.com>
Acked-by: NHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 99b32b24
...@@ -311,12 +311,13 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count) ...@@ -311,12 +311,13 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
} }
/* configure 1 or 2 channel mode */ /* configure 1 or 2 channel mode */
ret = vpif_config_data->setup_input_channel_mode if (vpif_config_data->setup_input_channel_mode) {
(vpif->std_info.ycmux_mode); ret = vpif_config_data->
setup_input_channel_mode(vpif->std_info.ycmux_mode);
if (ret < 0) { if (ret < 0) {
vpif_dbg(1, debug, "can't set vpif channel mode\n"); vpif_dbg(1, debug, "can't set vpif channel mode\n");
return ret; return ret;
}
} }
/* Call vpif_set_params function to set the parameters and addresses */ /* Call vpif_set_params function to set the parameters and addresses */
......
...@@ -280,12 +280,13 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count) ...@@ -280,12 +280,13 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
} }
/* clock settings */ /* clock settings */
ret = if (vpif_config_data->set_clock) {
vpif_config_data->set_clock(ch->vpifparams.std_info.ycmux_mode, ret = vpif_config_data->set_clock(ch->vpifparams.std_info.
ch->vpifparams.std_info.hd_sd); ycmux_mode, ch->vpifparams.std_info.hd_sd);
if (ret < 0) { if (ret < 0) {
vpif_err("can't set clock\n"); vpif_err("can't set clock\n");
return ret; return ret;
}
} }
/* set the parameters and addresses */ /* set the parameters and addresses */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册