diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /drivers/usb/misc/auerswald.c | |
parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/usb/misc/auerswald.c')
-rw-r--r-- | drivers/usb/misc/auerswald.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c index b293db3c28c3..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; |
@@ -2103,7 +2103,6 @@ MODULE_DEVICE_TABLE (usb, auerswald_ids); | |||
2103 | 2103 | ||
2104 | /* Standard usb driver struct */ | 2104 | /* Standard usb driver struct */ |
2105 | static struct usb_driver auerswald_driver = { | 2105 | static struct usb_driver auerswald_driver = { |
2106 | .owner = THIS_MODULE, | ||
2107 | .name = "auerswald", | 2106 | .name = "auerswald", |
2108 | .probe = auerswald_probe, | 2107 | .probe = auerswald_probe, |
2109 | .disconnect = auerswald_disconnect, | 2108 | .disconnect = auerswald_disconnect, |