Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e8eb0f0 authored Dec 11, 2005 by Jesper Juhl Committed by Greg Kroah-Hartman Jan 04, 2006

[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>

parent 740a4282

drivers/usb/media/usbvideo.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -725,7 +725,7 @@ int usbvideo_register(
		/* Allocate user_data separately because of kmalloc's limits */
		if (num_extra > 0) {
		up->user_size = num_cams * num_extra;
		up->user_data = (char *) kmalloc(up->user_size, GFP_KERNEL);
		up->user_data = kmalloc(up->user_size, GFP_KERNEL);
		if (up->user_data == NULL) {
		err("%s: Failed to allocate user_data (%d. bytes)",
		__FUNCTION__, up->user_size);

drivers/usb/media/w9968cf.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

drivers/usb/misc/auerswald.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -767,7 +767,7 @@ static int auerbuf_setup (pauerbufctl_t bcp, unsigned int numElements, unsigned
		memset (bep, 0, sizeof (auerbuf_t));
		bep->list = bcp;
		INIT_LIST_HEAD (&bep->buff_list);
		bep->bufp = (char *) kmalloc (bufsize, GFP_KERNEL);
		bep->bufp = kmalloc (bufsize, GFP_KERNEL);
		if (!bep->bufp)
		goto bl_fail;
		bep->dr = (struct usb_ctrlrequest *) kmalloc (sizeof (struct usb_ctrlrequest), GFP_KERNEL);
		@@ -1123,7 +1123,7 @@ static int auerswald_int_open (pauerswald_t cp)
		}
		}
		if (!cp->intbufp) {
		cp->intbufp = (char *) kmalloc (irqsize, GFP_KERNEL);
		cp->intbufp = kmalloc (irqsize, GFP_KERNEL);
		if (!cp->intbufp) {
		ret = -ENOMEM;
		goto intoend;

drivers/usb/misc/rio500.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -465,14 +465,14 @@ static int probe_rio(struct usb_interface *intf,

		rio->rio_dev = dev;

		if (!(rio->obuf = (char *) kmalloc(OBUF_SIZE, GFP_KERNEL))) {
		if (!(rio->obuf = kmalloc(OBUF_SIZE, GFP_KERNEL))) {
		err("probe_rio: Not enough memory for the output buffer");
		usb_deregister_dev(intf, &usb_rio_class);
		return -ENOMEM;
		}
		dbg("probe_rio: obuf address:%p", rio->obuf);

		if (!(rio->ibuf = (char *) kmalloc(IBUF_SIZE, GFP_KERNEL))) {
		if (!(rio->ibuf = kmalloc(IBUF_SIZE, GFP_KERNEL))) {
		err("probe_rio: Not enough memory for the input buffer");
		usb_deregister_dev(intf, &usb_rio_class);
		kfree(rio->obuf);