1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/usb/media/w9968cf.c b/drivers/usb/media/w9968cf.c
index 67612c81cb9f..3605a6f3067b 100644
--- a/drivers/usb/media/w9968cf.c
+++ b/drivers/usb/media/w9968cf.c
@@ -1533,12 +1533,12 @@ static int w9968cf_i2c_attach_inform(struct i2c_client* client)
                 }
         } else {
                 DBG(4, "Rejected client [%s] with driver [%s]", 
-                    client->name, client->driver->name)
+                    client->name, client->driver->driver.name)
                 return -EINVAL;
         }
 
         DBG(5, "I2C attach client [%s] with driver [%s]",
-            client->name, client->driver->name)
+            client->name, client->driver->driver.name)
 
         return 0;
 }
@@ -2958,7 +2958,7 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
         };
 
         #define V4L1_IOCTL(cmd) \
-                ((_IOC_NR((cmd)) < sizeof(v4l1_ioctls)/sizeof(char*)) ? \
+                ((_IOC_NR((cmd)) < ARRAY_SIZE(v4l1_ioctls)) ? \
                 v4l1_ioctls[_IOC_NR((cmd))] : "?")
 
         cam = (struct w9968cf_device*)video_get_drvdata(video_devdata(filp));
@@ -3554,7 +3554,7 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
 
 
         /* Allocate 2 bytes of memory for camera control USB transfers */
-        if (!(cam->control_buffer = (u16*)kmalloc(2, GFP_KERNEL))) {
+        if (!(cam->control_buffer = kmalloc(2, GFP_KERNEL))) {
                 DBG(1,"Couldn't allocate memory for camera control transfers")
                 err = -ENOMEM;
                 goto fail;
@@ -3562,7 +3562,7 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         memset(cam->control_buffer, 0, 2);
 
         /* Allocate 8 bytes of memory for USB data transfers to the FSB */
-        if (!(cam->data_buffer = (u16*)kmalloc(8, GFP_KERNEL))) {
+        if (!(cam->data_buffer = kmalloc(8, GFP_KERNEL))) {
                 DBG(1, "Couldn't allocate memory for data "
                        "transfers to the FSB")
                 err = -ENOMEM;
@@ -3668,7 +3668,6 @@ static void w9968cf_usb_disconnect(struct usb_interface* intf)
 
 
 static struct usb_driver w9968cf_usb_driver = {
-        .owner =      THIS_MODULE,
         .name =       "w9968cf",
         .id_table =   winbond_id_table,
         .probe =      w9968cf_usb_probe,