Skip to content

Commit

Permalink
[media] DaVinci-VPIF-Display: Adjust 11 checks for null pointers
Browse files Browse the repository at this point in the history
The script "checkpatch.pl" pointed information out like the following.

Comparison to NULL could be written...

Thus fix the affected source code places.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
  • Loading branch information
Markus Elfring authored and Mauro Carvalho Chehab committed Nov 16, 2016
1 parent ded1c8f commit 396c88e
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions drivers/media/platform/davinci/vpif_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,10 @@ static void vpif_stop_streaming(struct vb2_queue *vq)
vb2_buffer_done(&common->cur_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR);
} else {
if (common->cur_frm != NULL)
if (common->cur_frm)
vb2_buffer_done(&common->cur_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR);
if (common->next_frm != NULL)
if (common->next_frm)
vb2_buffer_done(&common->next_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR);
}
Expand Down Expand Up @@ -686,7 +686,7 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id std_id)
struct v4l2_output output;
int ret;

if (config->chan_config[ch->channel_id].outputs == NULL)
if (!config->chan_config[ch->channel_id].outputs)
return -ENODATA;

chan_cfg = &config->chan_config[ch->channel_id];
Expand Down Expand Up @@ -732,7 +732,7 @@ static int vpif_g_std(struct file *file, void *priv, v4l2_std_id *std)
struct vpif_display_chan_config *chan_cfg;
struct v4l2_output output;

if (config->chan_config[ch->channel_id].outputs == NULL)
if (!config->chan_config[ch->channel_id].outputs)
return -ENODATA;

chan_cfg = &config->chan_config[ch->channel_id];
Expand Down Expand Up @@ -783,11 +783,11 @@ vpif_output_to_subdev(struct vpif_display_config *vpif_cfg,

vpif_dbg(2, debug, "vpif_output_to_subdev\n");

if (chan_cfg->outputs == NULL)
if (!chan_cfg->outputs)
return -1;

subdev_name = chan_cfg->outputs[index].subdev_name;
if (subdev_name == NULL)
if (!subdev_name)
return -1;

/* loop through the sub device list to get the sub device info */
Expand Down Expand Up @@ -833,7 +833,7 @@ static int vpif_set_output(struct vpif_display_config *vpif_cfg,
}
ch->output_idx = index;
ch->sd = sd;
if (chan_cfg->outputs != NULL)
if (chan_cfg->outputs)
/* update tvnorms from the sub device output info */
ch->video_dev.tvnorms = chan_cfg->outputs[index].output.std;
return 0;
Expand Down Expand Up @@ -885,7 +885,7 @@ vpif_enum_dv_timings(struct file *file, void *priv,
struct v4l2_output output;
int ret;

if (config->chan_config[ch->channel_id].outputs == NULL)
if (!config->chan_config[ch->channel_id].outputs)
return -ENODATA;

chan_cfg = &config->chan_config[ch->channel_id];
Expand Down Expand Up @@ -922,7 +922,7 @@ static int vpif_s_dv_timings(struct file *file, void *priv,
struct v4l2_output output;
int ret;

if (config->chan_config[ch->channel_id].outputs == NULL)
if (!config->chan_config[ch->channel_id].outputs)
return -ENODATA;

chan_cfg = &config->chan_config[ch->channel_id];
Expand Down Expand Up @@ -1016,7 +1016,7 @@ static int vpif_g_dv_timings(struct file *file, void *priv,
struct video_obj *vid_ch = &ch->video;
struct v4l2_output output;

if (config->chan_config[ch->channel_id].outputs == NULL)
if (!config->chan_config[ch->channel_id].outputs)
goto error;

chan_cfg = &config->chan_config[ch->channel_id];
Expand Down Expand Up @@ -1275,7 +1275,7 @@ static __init int vpif_probe(struct platform_device *pdev)
subdev_count = vpif_obj.config->subdev_count;
subdevdata = vpif_obj.config->subdevinfo;
vpif_obj.sd = kcalloc(subdev_count, sizeof(*vpif_obj.sd), GFP_KERNEL);
if (vpif_obj.sd == NULL) {
if (!vpif_obj.sd) {
err = -ENOMEM;
goto vpif_unregister;
}
Expand Down

0 comments on commit 396c88e

Please sign in to comment.