Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2625bff authored by Randy Dunlap's avatar Randy Dunlap Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4786): Pvrusb2: use NULL instead of 0 



Fix sparse NULL usage warnings:
drivers/media/video/pvrusb2/pvrusb2-v4l2.c:714:14: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-v4l2.c:715:16: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-v4l2.c:1079:10: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c:224:58: warning: Using plain integer as NULL pointer

Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent ecba77f2

drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static unsigned int decoder_describe(struct pvr2_v4l_cx2584x *ctxt, 
static void decoder_reset(struct pvr2_v4l_cx2584x *ctxt)

{

	int ret;

	ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,0);

	ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,NULL);

	pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx25840 decoder_reset (ret=%d)",ret);

}

drivers/media/video/pvrusb2/pvrusb2-v4l2.c

+3 −3
Original line number Diff line number Diff line
@@ -711,8 +711,8 @@ static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip) 
	       dip->devbase.minor,pvr2_config_get_name(dip->config));



	/* Paranoia */

	dip->v4lp = 0;

	dip->stream = 0;

	dip->v4lp = NULL;

	dip->stream = NULL;



	/* Actual deallocation happens later when all internal references

	   are gone. */
@@ -1076,7 +1076,7 @@ struct pvr2_v4l2 *pvr2_v4l2_create(struct pvr2_context *mnp) 
	vp->vdev = kmalloc(sizeof(*vp->vdev),GFP_KERNEL);

	if (!vp->vdev) {

		kfree(vp);

		return 0;

		return NULL;

	}

	memset(vp->vdev,0,sizeof(*vp->vdev));

	pvr2_channel_init(&vp->channel,mnp);