diff options
Diffstat (limited to 'drivers/usb/gadget/m66592-udc.c')
-rw-r--r-- | drivers/usb/gadget/m66592-udc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c index 3608b3bd573..8981fbb5748 100644 --- a/drivers/usb/gadget/m66592-udc.c +++ b/drivers/usb/gadget/m66592-udc.c | |||
@@ -390,7 +390,7 @@ static int alloc_pipe_config(struct m66592_ep *ep, | |||
390 | int *counter; | 390 | int *counter; |
391 | int ret; | 391 | int ret; |
392 | 392 | ||
393 | ep->desc = desc; | 393 | ep->ep.desc = desc; |
394 | 394 | ||
395 | BUG_ON(ep->pipenum); | 395 | BUG_ON(ep->pipenum); |
396 | 396 | ||
@@ -558,7 +558,7 @@ static void start_packet_read(struct m66592_ep *ep, struct m66592_request *req) | |||
558 | 558 | ||
559 | static void start_packet(struct m66592_ep *ep, struct m66592_request *req) | 559 | static void start_packet(struct m66592_ep *ep, struct m66592_request *req) |
560 | { | 560 | { |
561 | if (ep->desc->bEndpointAddress & USB_DIR_IN) | 561 | if (ep->ep.desc->bEndpointAddress & USB_DIR_IN) |
562 | start_packet_write(ep, req); | 562 | start_packet_write(ep, req); |
563 | else | 563 | else |
564 | start_packet_read(ep, req); | 564 | start_packet_read(ep, req); |
@@ -734,7 +734,7 @@ __acquires(m66592->lock) | |||
734 | 734 | ||
735 | if (restart) { | 735 | if (restart) { |
736 | req = list_entry(ep->queue.next, struct m66592_request, queue); | 736 | req = list_entry(ep->queue.next, struct m66592_request, queue); |
737 | if (ep->desc) | 737 | if (ep->ep.desc) |
738 | start_packet(ep, req); | 738 | start_packet(ep, req); |
739 | } | 739 | } |
740 | } | 740 | } |
@@ -917,7 +917,7 @@ static void irq_pipe_ready(struct m66592 *m66592, u16 status, u16 enb) | |||
917 | ep = m66592->pipenum2ep[pipenum]; | 917 | ep = m66592->pipenum2ep[pipenum]; |
918 | req = list_entry(ep->queue.next, | 918 | req = list_entry(ep->queue.next, |
919 | struct m66592_request, queue); | 919 | struct m66592_request, queue); |
920 | if (ep->desc->bEndpointAddress & USB_DIR_IN) | 920 | if (ep->ep.desc->bEndpointAddress & USB_DIR_IN) |
921 | irq_packet_write(ep, req); | 921 | irq_packet_write(ep, req); |
922 | else | 922 | else |
923 | irq_packet_read(ep, req); | 923 | irq_packet_read(ep, req); |
@@ -1377,7 +1377,7 @@ static int m66592_queue(struct usb_ep *_ep, struct usb_request *_req, | |||
1377 | req->req.actual = 0; | 1377 | req->req.actual = 0; |
1378 | req->req.status = -EINPROGRESS; | 1378 | req->req.status = -EINPROGRESS; |
1379 | 1379 | ||
1380 | if (ep->desc == NULL) /* control */ | 1380 | if (ep->ep.desc == NULL) /* control */ |
1381 | start_ep0(ep, req); | 1381 | start_ep0(ep, req); |
1382 | else { | 1382 | else { |
1383 | if (request && !ep->busy) | 1383 | if (request && !ep->busy) |