4 files changed, 9 insertions, 11 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
index df8feac16aee..c80c26be6e4d 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
@@ -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);
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index f920e0ccacd3..1f787333d18c 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -1953,8 +1953,8 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
         return hdw;
  fail:
         if (hdw) {
-                if (hdw->ctl_read_urb) usb_free_urb(hdw->ctl_read_urb);
-                if (hdw->ctl_write_urb) usb_free_urb(hdw->ctl_write_urb);
+                usb_free_urb(hdw->ctl_read_urb);
+                usb_free_urb(hdw->ctl_write_urb);
                 if (hdw->ctl_read_buffer) kfree(hdw->ctl_read_buffer);
                 if (hdw->ctl_write_buffer) kfree(hdw->ctl_write_buffer);
                 if (hdw->controls) kfree(hdw->controls);
@@ -2575,12 +2575,10 @@ static void pvr2_ctl_timeout(unsigned long data)
         struct pvr2_hdw *hdw = (struct pvr2_hdw *)data;
         if (hdw->ctl_write_pend_flag || hdw->ctl_read_pend_flag) {
                 hdw->ctl_timeout_flag = !0;
-                if (hdw->ctl_write_pend_flag && hdw->ctl_write_urb) {
+                if (hdw->ctl_write_pend_flag)
                         usb_unlink_urb(hdw->ctl_write_urb);
-                }
-                if (hdw->ctl_read_pend_flag && hdw->ctl_read_urb) {
+                if (hdw->ctl_read_pend_flag)
                         usb_unlink_urb(hdw->ctl_read_urb);
-                }
         }
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.c b/drivers/media/video/pvrusb2/pvrusb2-io.c
index 70aa63eba0cb..57fb32033543 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-io.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-io.c
@@ -289,7 +289,7 @@ static void pvr2_buffer_done(struct pvr2_buffer *bp)
         pvr2_buffer_set_none(bp);
         bp->signature = 0;
         bp->stream = NULL;
-        if (bp->purb) usb_free_urb(bp->purb);
+        usb_free_urb(bp->purb);
         pvr2_trace(PVR2_TRACE_BUF_POOL,"/*---TRACE_FLOW---*/"
                    " bufferDone     %p",bp);
 }
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 97e974d9b9c3..bb40e9085977 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -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);