aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/gadget/r8a66597-udc.c4
-rw-r--r--drivers/usb/gadget/r8a66597-udc.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index d3f81c96cd78..60c62e418f0e 100644
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -723,7 +723,7 @@ static void irq_ep0_write(struct r8a66597_ep *ep, struct r8a66597_request *req)
723 /* write fifo */ 723 /* write fifo */
724 if (req->req.buf) { 724 if (req->req.buf) {
725 if (size > 0) 725 if (size > 0)
726 r8a66597_write_fifo(r8a66597, ep->fifoaddr, buf, size); 726 r8a66597_write_fifo(r8a66597, ep, buf, size);
727 if ((size == 0) || ((size % ep->ep.maxpacket) != 0)) 727 if ((size == 0) || ((size % ep->ep.maxpacket) != 0))
728 r8a66597_bset(r8a66597, BVAL, ep->fifoctr); 728 r8a66597_bset(r8a66597, BVAL, ep->fifoctr);
729 } 729 }
@@ -770,7 +770,7 @@ static void irq_packet_write(struct r8a66597_ep *ep,
770 770
771 /* write fifo */ 771 /* write fifo */
772 if (req->req.buf) { 772 if (req->req.buf) {
773 r8a66597_write_fifo(r8a66597, ep->fifoaddr, buf, size); 773 r8a66597_write_fifo(r8a66597, ep, buf, size);
774 if ((size == 0) 774 if ((size == 0)
775 || ((size % ep->ep.maxpacket) != 0) 775 || ((size % ep->ep.maxpacket) != 0)
776 || ((bufsize != ep->ep.maxpacket) 776 || ((bufsize != ep->ep.maxpacket)
diff --git a/drivers/usb/gadget/r8a66597-udc.h b/drivers/usb/gadget/r8a66597-udc.h
index a373c4e64b44..31047f899c37 100644
--- a/drivers/usb/gadget/r8a66597-udc.h
+++ b/drivers/usb/gadget/r8a66597-udc.h
@@ -173,11 +173,11 @@ static inline void r8a66597_write(struct r8a66597 *r8a66597, u16 val,
173} 173}
174 174
175static inline void r8a66597_write_fifo(struct r8a66597 *r8a66597, 175static inline void r8a66597_write_fifo(struct r8a66597 *r8a66597,
176 unsigned long offset, 176 struct r8a66597_ep *ep,
177 unsigned char *buf, 177 unsigned char *buf,
178 int len) 178 int len)
179{ 179{
180 void __iomem *fifoaddr = r8a66597->reg + offset; 180 void __iomem *fifoaddr = r8a66597->reg + ep->fifoaddr;
181 int adj = 0; 181 int adj = 0;
182 int i; 182 int i;
183 183