1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.c b/drivers/media/video/pvrusb2/pvrusb2-io.c
index c032777a977f..681f79c8064e 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-io.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-io.c
@@ -116,8 +116,8 @@ static void pvr2_buffer_describe(struct pvr2_buffer *bp,const char *msg)
                    (bp ? pvr2_buffer_state_decode(bp->state) : "(invalid)"),
                    (bp ? bp->id : 0),
                    (bp ? bp->status : 0),
-                   (bp ? bp->stream : 0),
-                   (bp ? bp->purb : 0),
+                   (bp ? bp->stream : NULL),
+                   (bp ? bp->purb : NULL),
                    (bp ? bp->signature : 0));
 }
 #endif  /*  SANITY_CHECK_BUFFERS  */
@@ -286,7 +286,7 @@ static void pvr2_buffer_done(struct pvr2_buffer *bp)
         pvr2_buffer_wipe(bp);
         pvr2_buffer_set_none(bp);
         bp->signature = 0;
-        bp->stream = 0;
+        bp->stream = NULL;
         if (bp->purb) usb_free_urb(bp->purb);
         pvr2_trace(PVR2_TRACE_BUF_POOL,"/*---TRACE_FLOW---*/"
                    " bufferDone     %p",bp);
@@ -341,13 +341,13 @@ static int pvr2_stream_buffer_count(struct pvr2_stream *sp,unsigned int cnt)
                         struct pvr2_buffer *bp;
                         bp = sp->buffers[sp->buffer_total_count - 1];
                         /* Paranoia */
-                        sp->buffers[sp->buffer_total_count - 1] = 0;
+                        sp->buffers[sp->buffer_total_count - 1] = NULL;
                         (sp->buffer_total_count)--;
                         pvr2_buffer_done(bp);
                         kfree(bp);
                 }
                 if (scnt < sp->buffer_slot_count) {
-                        struct pvr2_buffer **nb = 0;
+                        struct pvr2_buffer **nb = NULL;
                         if (scnt) {
                                 nb = kmalloc(scnt * sizeof(*nb),GFP_KERNEL);
                                 if (!nb) return -ENOMEM;
@@ -530,21 +530,21 @@ int pvr2_stream_set_buffer_count(struct pvr2_stream *sp,unsigned int cnt)
 struct pvr2_buffer *pvr2_stream_get_idle_buffer(struct pvr2_stream *sp)
 {
         struct list_head *lp = sp->idle_list.next;
-        if (lp == &sp->idle_list) return 0;
+        if (lp == &sp->idle_list) return NULL;
         return list_entry(lp,struct pvr2_buffer,list_overhead);
 }
 
 struct pvr2_buffer *pvr2_stream_get_ready_buffer(struct pvr2_stream *sp)
 {
         struct list_head *lp = sp->ready_list.next;
-        if (lp == &sp->ready_list) return 0;
+        if (lp == &sp->ready_list) return NULL;
         return list_entry(lp,struct pvr2_buffer,list_overhead);
 }
 
 struct pvr2_buffer *pvr2_stream_get_buffer(struct pvr2_stream *sp,int id)
 {
-        if (id < 0) return 0;
-        if (id >= sp->buffer_total_count) return 0;
+        if (id < 0) return NULL;
+        if (id >= sp->buffer_total_count) return NULL;
         return sp->buffers[id];
 }