Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Harvey Harrison and committed by
Linus Torvalds
a6a3a17b 172c122d

+16 -13
+1 -1
drivers/media/video/au0828/au0828-dvb.c
··· 119 119 purb->transfer_buffer = kzalloc(URB_BUFSIZE, GFP_KERNEL); 120 120 if (!purb->transfer_buffer) { 121 121 usb_free_urb(purb); 122 - dev->urbs[i] = 0; 122 + dev->urbs[i] = NULL; 123 123 goto err; 124 124 } 125 125
+2 -2
drivers/media/video/ivtv/ivtv-yuv.c
··· 1098 1098 ivtv_yuv_next_free(itv); 1099 1099 1100 1100 /* Copy V4L2 parameters to an ivtv_dma_frame struct... */ 1101 - dma_args.y_source = 0L; 1102 - dma_args.uv_source = 0L; 1101 + dma_args.y_source = NULL; 1102 + dma_args.uv_source = NULL; 1103 1103 dma_args.src.left = 0; 1104 1104 dma_args.src.top = 0; 1105 1105 dma_args.src.width = yi->v4l2_src_w;
+1 -1
drivers/media/video/pvrusb2/pvrusb2-audio.c
··· 75 75 pvr2_trace(PVR2_TRACE_CHIPS,"i2c msp3400 v4l2 set_stereo"); 76 76 77 77 if ((sid < ARRAY_SIZE(routing_schemes)) && 78 - ((sp = routing_schemes + sid) != 0) && 78 + ((sp = routing_schemes + sid) != NULL) && 79 79 (hdw->input_val >= 0) && 80 80 (hdw->input_val < sp->cnt)) { 81 81 route.input = sp->def[hdw->input_val];
+1 -1
drivers/media/video/pvrusb2/pvrusb2-context.c
··· 195 195 int pvr2_context_global_init(void) 196 196 { 197 197 pvr2_context_thread_ptr = kthread_run(pvr2_context_thread_func, 198 - 0, 198 + NULL, 199 199 "pvrusb2-context"); 200 200 return (pvr2_context_thread_ptr ? 0 : -ENOMEM); 201 201 }
+1 -1
drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
··· 123 123 memset(&route,0,sizeof(route)); 124 124 125 125 if ((sid < ARRAY_SIZE(routing_schemes)) && 126 - ((sp = routing_schemes + sid) != 0) && 126 + ((sp = routing_schemes + sid) != NULL) && 127 127 (hdw->input_val >= 0) && 128 128 (hdw->input_val < sp->cnt)) { 129 129 vid_input = sp->def[hdw->input_val].vid;
+3 -3
drivers/media/video/pvrusb2/pvrusb2-dvb.c
··· 130 130 for (idx = 0; idx < PVR2_DVB_BUFFER_COUNT; idx++) { 131 131 if (!(adap->buffer_storage[idx])) continue; 132 132 kfree(adap->buffer_storage[idx]); 133 - adap->buffer_storage[idx] = 0; 133 + adap->buffer_storage[idx] = NULL; 134 134 } 135 135 adap->stream_run = 0; 136 136 } ··· 142 142 unsigned int idx; 143 143 int ret; 144 144 struct pvr2_buffer *bp; 145 - struct pvr2_stream *stream = 0; 145 + struct pvr2_stream *stream = NULL; 146 146 147 147 if (adap->stream_run) return -EIO; 148 148 ··· 174 174 ret = pvr2_hdw_set_streaming(adap->channel.hdw, 1); 175 175 if (ret < 0) return ret; 176 176 177 - while ((bp = pvr2_stream_get_idle_buffer(stream)) != 0) { 177 + while ((bp = pvr2_stream_get_idle_buffer(stream)) != NULL) { 178 178 ret = pvr2_buffer_queue(bp); 179 179 if (ret < 0) return ret; 180 180 }
+1 -1
drivers/media/video/pvrusb2/pvrusb2-v4l2.c
··· 1261 1261 fail: 1262 1262 pvr2_trace(PVR2_TRACE_STRUCT,"Failure creating pvr2_v4l2 id=%p",vp); 1263 1263 pvr2_v4l2_destroy_no_lock(vp); 1264 - return 0; 1264 + return NULL; 1265 1265 } 1266 1266 1267 1267 /*
+1 -1
drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
··· 81 81 pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 set_input(%d)",hdw->input_val); 82 82 83 83 if ((sid < ARRAY_SIZE(routing_schemes)) && 84 - ((sp = routing_schemes + sid) != 0) && 84 + ((sp = routing_schemes + sid) != NULL) && 85 85 (hdw->input_val >= 0) && 86 86 (hdw->input_val < sp->cnt)) { 87 87 route.input = sp->def[hdw->input_val];
+1 -1
drivers/media/video/v4l2-common.c
··· 716 716 int err; 717 717 718 718 client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); 719 - if (client == 0) 719 + if (!client) 720 720 return -ENOMEM; 721 721 722 722 client->addr = address;
+4 -1
drivers/media/video/videobuf-core.c
··· 97 97 void *videobuf_queue_to_vmalloc (struct videobuf_queue *q, 98 98 struct videobuf_buffer *buf) 99 99 { 100 - return CALL(q, vmalloc, buf); 100 + if (q->int_ops->vmalloc) 101 + return q->int_ops->vmalloc(buf); 102 + else 103 + return NULL; 101 104 } 102 105 EXPORT_SYMBOL_GPL(videobuf_queue_to_vmalloc); 103 106