Re: [PATCH] media: davinci: vpif: add check for NULL handler
From: Prabhakar Lad
Date: Thu Sep 27 2012 - 01:22:02 EST
Hi Mauro,
On Thu, Sep 27, 2012 at 1:37 AM, Mauro Carvalho Chehab
<mchehab@xxxxxxxxxxxxx> wrote:
> Em Thu, 16 Aug 2012 19:32:00 +0530
> Prabhakar Lad <prabhakar.lad@xxxxxx> escreveu:
>
> It is amazing how many SOB's/acks are in this patch and nobody
> asked you to provide a patch description... the subject just
> tells what the code is also telling. Could you please provide
> a better patch description?
>
My bad I'll post a v2.
Regards,
--Prabhakar Lad
> Thanks!
> Mauro
>
>> From: Lad, Prabhakar <prabhakar.lad@xxxxxx>
>>
>> Signed-off-by: Lad, Prabhakar <prabhakar.lad@xxxxxx>
>> Signed-off-by: Manjunath Hadli <manjunath.hadli@xxxxxx>
>> Cc: Hans Verkuil <hans.verkuil@xxxxxxxxx>
>> ---
>> drivers/media/video/davinci/vpif_capture.c | 12 +++++++-----
>> drivers/media/video/davinci/vpif_display.c | 14 ++++++++------
>> 2 files changed, 15 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c
>> index 266025e..a87b7a5 100644
>> --- a/drivers/media/video/davinci/vpif_capture.c
>> +++ b/drivers/media/video/davinci/vpif_capture.c
>> @@ -311,12 +311,14 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
>> }
>>
>> /* configure 1 or 2 channel mode */
>> - ret = vpif_config_data->setup_input_channel_mode
>> - (vpif->std_info.ycmux_mode);
>> + if (vpif_config_data->setup_input_channel_mode) {
>> + ret = vpif_config_data->setup_input_channel_mode
>> + (vpif->std_info.ycmux_mode);
>>
>> - if (ret < 0) {
>> - vpif_dbg(1, debug, "can't set vpif channel mode\n");
>> - return ret;
>> + if (ret < 0) {
>> + vpif_dbg(1, debug, "can't set vpif channel mode\n");
>> + return ret;
>> + }
>> }
>>
>> /* Call vpif_set_params function to set the parameters and addresses */
>> diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c
>> index e129c98..1e35f92 100644
>> --- a/drivers/media/video/davinci/vpif_display.c
>> +++ b/drivers/media/video/davinci/vpif_display.c
>> @@ -280,12 +280,14 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
>> }
>>
>> /* clock settings */
>> - ret =
>> - vpif_config_data->set_clock(ch->vpifparams.std_info.ycmux_mode,
>> - ch->vpifparams.std_info.hd_sd);
>> - if (ret < 0) {
>> - vpif_err("can't set clock\n");
>> - return ret;
>> + if (vpif_config_data->set_clock) {
>> + ret =
>> + vpif_config_data->set_clock(ch->vpifparams.std_info.ycmux_mode,
>> + ch->vpifparams.std_info.hd_sd);
>> + if (ret < 0) {
>> + vpif_err("can't set clock\n");
>> + return ret;
>> + }
>> }
>>
>> /* set the parameters and addresses */
>
>
>
>
> Cheers,
> Mauro
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/