aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/wusbcore/wa-hc.c
diff options
context:
space:
mode:
authorThomas Pugliese <thomas.pugliese@gmail.com>2013-09-26 11:49:41 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-26 19:27:20 -0400
commit0367eef281006923bd35ee323cdc5d21179afe5a (patch)
tree65fab0d4f72bf1962f661b1bceb43c1c10ad9812 /drivers/usb/wusbcore/wa-hc.c
parent09d94cbd599e3b74b201d389d36cc260b67d318f (diff)
usb: wusbcore: rename fields in struct wahc
Rename xfer_result to dti_buf and xfer_result_size to dti_buf_size in struct wahc. The dti buffer will also be used for isochronous status packets once isochronous transfers are supported. Signed-off-by: Thomas Pugliese <thomas.pugliese@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/wusbcore/wa-hc.c')
-rw-r--r--drivers/usb/wusbcore/wa-hc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/wusbcore/wa-hc.c b/drivers/usb/wusbcore/wa-hc.c
index a09b65ebd9bb..6c09b0e4672b 100644
--- a/drivers/usb/wusbcore/wa-hc.c
+++ b/drivers/usb/wusbcore/wa-hc.c
@@ -44,11 +44,11 @@ int wa_create(struct wahc *wa, struct usb_interface *iface)
44 /* Fill up Data Transfer EP pointers */ 44 /* Fill up Data Transfer EP pointers */
45 wa->dti_epd = &iface->cur_altsetting->endpoint[1].desc; 45 wa->dti_epd = &iface->cur_altsetting->endpoint[1].desc;
46 wa->dto_epd = &iface->cur_altsetting->endpoint[2].desc; 46 wa->dto_epd = &iface->cur_altsetting->endpoint[2].desc;
47 wa->xfer_result_size = usb_endpoint_maxp(wa->dti_epd); 47 wa->dti_buf_size = usb_endpoint_maxp(wa->dti_epd);
48 wa->xfer_result = kmalloc(wa->xfer_result_size, GFP_KERNEL); 48 wa->dti_buf = kmalloc(wa->dti_buf_size, GFP_KERNEL);
49 if (wa->xfer_result == NULL) { 49 if (wa->dti_buf == NULL) {
50 result = -ENOMEM; 50 result = -ENOMEM;
51 goto error_xfer_result_alloc; 51 goto error_dti_buf_alloc;
52 } 52 }
53 result = wa_nep_create(wa, iface); 53 result = wa_nep_create(wa, iface);
54 if (result < 0) { 54 if (result < 0) {
@@ -59,8 +59,8 @@ int wa_create(struct wahc *wa, struct usb_interface *iface)
59 return 0; 59 return 0;
60 60
61error_nep_create: 61error_nep_create:
62 kfree(wa->xfer_result); 62 kfree(wa->dti_buf);
63error_xfer_result_alloc: 63error_dti_buf_alloc:
64 wa_rpipes_destroy(wa); 64 wa_rpipes_destroy(wa);
65error_rpipes_create: 65error_rpipes_create:
66 return result; 66 return result;
@@ -76,7 +76,7 @@ void __wa_destroy(struct wahc *wa)
76 usb_kill_urb(wa->buf_in_urb); 76 usb_kill_urb(wa->buf_in_urb);
77 usb_put_urb(wa->buf_in_urb); 77 usb_put_urb(wa->buf_in_urb);
78 } 78 }
79 kfree(wa->xfer_result); 79 kfree(wa->dti_buf);
80 wa_nep_destroy(wa); 80 wa_nep_destroy(wa);
81 wa_rpipes_destroy(wa); 81 wa_rpipes_destroy(wa);
82} 82}