diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/usb/wusbcore/wa-hc.c | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'drivers/usb/wusbcore/wa-hc.c')
-rw-r--r-- | drivers/usb/wusbcore/wa-hc.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/wusbcore/wa-hc.c b/drivers/usb/wusbcore/wa-hc.c index a09b65ebd9b..59a748a0e5d 100644 --- a/drivers/usb/wusbcore/wa-hc.c +++ b/drivers/usb/wusbcore/wa-hc.c | |||
@@ -23,7 +23,6 @@ | |||
23 | * FIXME: docs | 23 | * FIXME: docs |
24 | */ | 24 | */ |
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | #include <linux/module.h> | ||
27 | #include "wusbhc.h" | 26 | #include "wusbhc.h" |
28 | #include "wa-hc.h" | 27 | #include "wa-hc.h" |
29 | 28 | ||
@@ -44,12 +43,10 @@ int wa_create(struct wahc *wa, struct usb_interface *iface) | |||
44 | /* Fill up Data Transfer EP pointers */ | 43 | /* Fill up Data Transfer EP pointers */ |
45 | wa->dti_epd = &iface->cur_altsetting->endpoint[1].desc; | 44 | wa->dti_epd = &iface->cur_altsetting->endpoint[1].desc; |
46 | wa->dto_epd = &iface->cur_altsetting->endpoint[2].desc; | 45 | wa->dto_epd = &iface->cur_altsetting->endpoint[2].desc; |
47 | wa->xfer_result_size = usb_endpoint_maxp(wa->dti_epd); | 46 | wa->xfer_result_size = le16_to_cpu(wa->dti_epd->wMaxPacketSize); |
48 | wa->xfer_result = kmalloc(wa->xfer_result_size, GFP_KERNEL); | 47 | wa->xfer_result = kmalloc(wa->xfer_result_size, GFP_KERNEL); |
49 | if (wa->xfer_result == NULL) { | 48 | if (wa->xfer_result == NULL) |
50 | result = -ENOMEM; | ||
51 | goto error_xfer_result_alloc; | 49 | goto error_xfer_result_alloc; |
52 | } | ||
53 | result = wa_nep_create(wa, iface); | 50 | result = wa_nep_create(wa, iface); |
54 | if (result < 0) { | 51 | if (result < 0) { |
55 | dev_err(dev, "WA-CDS: can't initialize notif endpoint: %d\n", | 52 | dev_err(dev, "WA-CDS: can't initialize notif endpoint: %d\n", |