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

Commit a6a3a17b authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

media: fix integer as NULL pointer warnings 



drivers/media/video/v4l2-common.c:719:16: warning: Using plain integer as NULL pointer
drivers/media/video/au0828/au0828-dvb.c:122:19: warning: Using plain integer as NULL pointer
drivers/media/video/ivtv/ivtv-yuv.c:1101:22: warning: Using plain integer as NULL pointer
drivers/media/video/ivtv/ivtv-yuv.c:1102:23: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-audio.c:78:39: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-video-v4l.c:84:39: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-v4l2.c:1264:9: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-context.c:197:28: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c:126:39: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-dvb.c:133:32: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-dvb.c:145:31: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-dvb.c:177:55: warning: Using plain integer as NULL pointer
drivers/media/video/videobuf-core.c:100:9: warning: Using plain integer as NULL pointer

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 172c122d

drivers/media/video/au0828/au0828-dvb.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static int start_urb_transfer(struct au0828_dev *dev) 
		purb->transfer_buffer = kzalloc(URB_BUFSIZE, GFP_KERNEL);

		if (!purb->transfer_buffer) {

			usb_free_urb(purb);

			dev->urbs[i] = 0;

			dev->urbs[i] = NULL;

			goto err;

		}

drivers/media/video/ivtv/ivtv-yuv.c

+2 −2
Original line number Diff line number Diff line
@@ -1098,8 +1098,8 @@ void ivtv_yuv_setup_stream_frame(struct ivtv *itv) 
	ivtv_yuv_next_free(itv);



	/* Copy V4L2 parameters to an ivtv_dma_frame struct... */

	dma_args.y_source = 0L;

	dma_args.uv_source = 0L;

	dma_args.y_source = NULL;

	dma_args.uv_source = NULL;

	dma_args.src.left = 0;

	dma_args.src.top = 0;

	dma_args.src.width = yi->v4l2_src_w;

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

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static void set_stereo(struct pvr2_msp3400_handler *ctxt) 
	pvr2_trace(PVR2_TRACE_CHIPS,"i2c msp3400 v4l2 set_stereo");



	if ((sid < ARRAY_SIZE(routing_schemes)) &&

	    ((sp = routing_schemes + sid) != 0) &&

	    ((sp = routing_schemes + sid) != NULL) &&

	    (hdw->input_val >= 0) &&

	    (hdw->input_val < sp->cnt)) {

		route.input = sp->def[hdw->input_val];

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

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static int pvr2_context_thread_func(void *foo) 
int pvr2_context_global_init(void)

{

	pvr2_context_thread_ptr = kthread_run(pvr2_context_thread_func,

					      0,

					      NULL,

					      "pvrusb2-context");

	return (pvr2_context_thread_ptr ? 0 : -ENOMEM);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static void set_input(struct pvr2_v4l_cx2584x *ctxt) 
	memset(&route,0,sizeof(route));



	if ((sid < ARRAY_SIZE(routing_schemes)) &&

	    ((sp = routing_schemes + sid) != 0) &&

	    ((sp = routing_schemes + sid) != NULL) &&

	    (hdw->input_val >= 0) &&

	    (hdw->input_val < sp->cnt)) {

		vid_input = sp->def[hdw->input_val].vid;