3 files changed, 5 insertions, 3 deletions

diff --git a/drivers/media/dvb/dvb-usb/gp8psk.c b/drivers/media/dvb/dvb-usb/gp8psk.c
index 334269bd065d..7375eb20166d 100644
--- a/drivers/media/dvb/dvb-usb/gp8psk.c
+++ b/drivers/media/dvb/dvb-usb/gp8psk.c
@@ -219,7 +219,7 @@ static struct dvb_usb_device_properties gp8psk_properties = {
                   .cold_ids = { &gp8psk_usb_table[0], NULL },
                   .warm_ids = { &gp8psk_usb_table[1], NULL },
                 },
-                { 0 },
+                { NULL },
         }
 };
 
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 663b7137972c..46738321adaf 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -896,7 +896,7 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file,
                 snprintf(name, sizeof(name), "%s/2", core->name);
                 printk("%s/2: ============  START LOG STATUS  ============\n",
                        core->name);
-                cx88_call_i2c_clients(core, VIDIOC_LOG_STATUS, 0);
+                cx88_call_i2c_clients(core, VIDIOC_LOG_STATUS, NULL);
                 cx2341x_log_status(&dev->params, name);
                 printk("%s/2: =============  END LOG STATUS  =============\n",
                        core->name);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
index ed3e8105292a..05121666b9ba 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include <linux/kernel.h>
 #include "pvrusb2-i2c-core.h"
 #include "pvrusb2-hdw-internal.h"
 #include "pvrusb2-debug.h"
@@ -89,7 +90,8 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
 
 const struct pvr2_i2c_op *pvr2_i2c_get_op(unsigned int idx)
 {
-        if (idx >= sizeof(ops)/sizeof(ops[0])) return 0;
+        if (idx >= ARRAY_SIZE(ops))
+                return NULL;
         return ops[idx];
 }