diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-12-11 14:34:02 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-04 16:51:43 -0500 |
commit | 0e8eb0f06b21bc05c42bcdbb6b273fce59ba9689 (patch) | |
tree | 8f147c0484a46e4c4a488378a760da64c00057aa /drivers/usb/media | |
parent | 740a4282ed5cf0fbcad9a1a1660f24e1b5d11ed2 (diff) |
[PATCH] USB: Remove unneeded kmalloc() return value casts
Remove kmalloc() return value casts that we don't need from
drivers/usb/*
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/media')
-rw-r--r-- | drivers/usb/media/usbvideo.c | 2 | ||||
-rw-r--r-- | drivers/usb/media/w9968cf.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/media/usbvideo.c b/drivers/usb/media/usbvideo.c index af0585906b2e..4bd113325ef9 100644 --- a/drivers/usb/media/usbvideo.c +++ b/drivers/usb/media/usbvideo.c | |||
@@ -725,7 +725,7 @@ int usbvideo_register( | |||
725 | /* Allocate user_data separately because of kmalloc's limits */ | 725 | /* Allocate user_data separately because of kmalloc's limits */ |
726 | if (num_extra > 0) { | 726 | if (num_extra > 0) { |
727 | up->user_size = num_cams * num_extra; | 727 | up->user_size = num_cams * num_extra; |
728 | up->user_data = (char *) kmalloc(up->user_size, GFP_KERNEL); | 728 | up->user_data = kmalloc(up->user_size, GFP_KERNEL); |
729 | if (up->user_data == NULL) { | 729 | if (up->user_data == NULL) { |
730 | err("%s: Failed to allocate user_data (%d. bytes)", | 730 | err("%s: Failed to allocate user_data (%d. bytes)", |
731 | __FUNCTION__, up->user_size); | 731 | __FUNCTION__, up->user_size); |
diff --git a/drivers/usb/media/w9968cf.c b/drivers/usb/media/w9968cf.c index 8d6a1ff6595f..04d69339c054 100644 --- a/drivers/usb/media/w9968cf.c +++ b/drivers/usb/media/w9968cf.c | |||
@@ -3554,7 +3554,7 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id) | |||
3554 | 3554 | ||
3555 | 3555 | ||
3556 | /* Allocate 2 bytes of memory for camera control USB transfers */ | 3556 | /* Allocate 2 bytes of memory for camera control USB transfers */ |
3557 | if (!(cam->control_buffer = (u16*)kmalloc(2, GFP_KERNEL))) { | 3557 | if (!(cam->control_buffer = kmalloc(2, GFP_KERNEL))) { |
3558 | DBG(1,"Couldn't allocate memory for camera control transfers") | 3558 | DBG(1,"Couldn't allocate memory for camera control transfers") |
3559 | err = -ENOMEM; | 3559 | err = -ENOMEM; |
3560 | goto fail; | 3560 | goto fail; |
@@ -3562,7 +3562,7 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id) | |||
3562 | memset(cam->control_buffer, 0, 2); | 3562 | memset(cam->control_buffer, 0, 2); |
3563 | 3563 | ||
3564 | /* Allocate 8 bytes of memory for USB data transfers to the FSB */ | 3564 | /* Allocate 8 bytes of memory for USB data transfers to the FSB */ |
3565 | if (!(cam->data_buffer = (u16*)kmalloc(8, GFP_KERNEL))) { | 3565 | if (!(cam->data_buffer = kmalloc(8, GFP_KERNEL))) { |
3566 | DBG(1, "Couldn't allocate memory for data " | 3566 | DBG(1, "Couldn't allocate memory for data " |
3567 | "transfers to the FSB") | 3567 | "transfers to the FSB") |
3568 | err = -ENOMEM; | 3568 | err = -ENOMEM; |