diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/media/usbvideo.c | 2 | ||||
-rw-r--r-- | drivers/usb/media/w9968cf.c | 4 | ||||
-rw-r--r-- | drivers/usb/misc/auerswald.c | 4 | ||||
-rw-r--r-- | drivers/usb/misc/rio500.c | 4 |
4 files changed, 7 insertions, 7 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; |
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c index fad387f21891..449b2501acf3 100644 --- a/drivers/usb/misc/auerswald.c +++ b/drivers/usb/misc/auerswald.c | |||
@@ -767,7 +767,7 @@ static int auerbuf_setup (pauerbufctl_t bcp, unsigned int numElements, unsigned | |||
767 | memset (bep, 0, sizeof (auerbuf_t)); | 767 | memset (bep, 0, sizeof (auerbuf_t)); |
768 | bep->list = bcp; | 768 | bep->list = bcp; |
769 | INIT_LIST_HEAD (&bep->buff_list); | 769 | INIT_LIST_HEAD (&bep->buff_list); |
770 | bep->bufp = (char *) kmalloc (bufsize, GFP_KERNEL); | 770 | bep->bufp = kmalloc (bufsize, GFP_KERNEL); |
771 | if (!bep->bufp) | 771 | if (!bep->bufp) |
772 | goto bl_fail; | 772 | goto bl_fail; |
773 | bep->dr = (struct usb_ctrlrequest *) kmalloc (sizeof (struct usb_ctrlrequest), GFP_KERNEL); | 773 | bep->dr = (struct usb_ctrlrequest *) kmalloc (sizeof (struct usb_ctrlrequest), GFP_KERNEL); |
@@ -1123,7 +1123,7 @@ static int auerswald_int_open (pauerswald_t cp) | |||
1123 | } | 1123 | } |
1124 | } | 1124 | } |
1125 | if (!cp->intbufp) { | 1125 | if (!cp->intbufp) { |
1126 | cp->intbufp = (char *) kmalloc (irqsize, GFP_KERNEL); | 1126 | cp->intbufp = kmalloc (irqsize, GFP_KERNEL); |
1127 | if (!cp->intbufp) { | 1127 | if (!cp->intbufp) { |
1128 | ret = -ENOMEM; | 1128 | ret = -ENOMEM; |
1129 | goto intoend; | 1129 | goto intoend; |
diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c index b9d66074b80c..384fa3769805 100644 --- a/drivers/usb/misc/rio500.c +++ b/drivers/usb/misc/rio500.c | |||
@@ -465,14 +465,14 @@ static int probe_rio(struct usb_interface *intf, | |||
465 | 465 | ||
466 | rio->rio_dev = dev; | 466 | rio->rio_dev = dev; |
467 | 467 | ||
468 | if (!(rio->obuf = (char *) kmalloc(OBUF_SIZE, GFP_KERNEL))) { | 468 | if (!(rio->obuf = kmalloc(OBUF_SIZE, GFP_KERNEL))) { |
469 | err("probe_rio: Not enough memory for the output buffer"); | 469 | err("probe_rio: Not enough memory for the output buffer"); |
470 | usb_deregister_dev(intf, &usb_rio_class); | 470 | usb_deregister_dev(intf, &usb_rio_class); |
471 | return -ENOMEM; | 471 | return -ENOMEM; |
472 | } | 472 | } |
473 | dbg("probe_rio: obuf address:%p", rio->obuf); | 473 | dbg("probe_rio: obuf address:%p", rio->obuf); |
474 | 474 | ||
475 | if (!(rio->ibuf = (char *) kmalloc(IBUF_SIZE, GFP_KERNEL))) { | 475 | if (!(rio->ibuf = kmalloc(IBUF_SIZE, GFP_KERNEL))) { |
476 | err("probe_rio: Not enough memory for the input buffer"); | 476 | err("probe_rio: Not enough memory for the input buffer"); |
477 | usb_deregister_dev(intf, &usb_rio_class); | 477 | usb_deregister_dev(intf, &usb_rio_class); |
478 | kfree(rio->obuf); | 478 | kfree(rio->obuf); |