diff options
Diffstat (limited to 'drivers/usb/host/r8a66597-hcd.c')
-rw-r--r-- | drivers/usb/host/r8a66597-hcd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index 4586369dda00..40a0d8b03ad7 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * Portions Copyright (C) 2004-2005 David Brownell | 6 | * Portions Copyright (C) 2004-2005 David Brownell |
7 | * Portions Copyright (C) 1999 Roman Weissgaerber | 7 | * Portions Copyright (C) 1999 Roman Weissgaerber |
8 | * | 8 | * |
9 | * Author : Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> | 9 | * Author : Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
10 | * | 10 | * |
11 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
12 | * it under the terms of the GNU General Public License as published by | 12 | * it under the terms of the GNU General Public License as published by |
@@ -1438,7 +1438,7 @@ static void packet_write(struct r8a66597 *r8a66597, u16 pipenum) | |||
1438 | if (pipenum > 0) | 1438 | if (pipenum > 0) |
1439 | r8a66597_write(r8a66597, ~(1 << pipenum), BEMPSTS); | 1439 | r8a66597_write(r8a66597, ~(1 << pipenum), BEMPSTS); |
1440 | if (urb->transfer_buffer) { | 1440 | if (urb->transfer_buffer) { |
1441 | r8a66597_write_fifo(r8a66597, td->pipe->fifoaddr, buf, size); | 1441 | r8a66597_write_fifo(r8a66597, td->pipe, buf, size); |
1442 | if (!usb_pipebulk(urb->pipe) || td->maxpacket != size) | 1442 | if (!usb_pipebulk(urb->pipe) || td->maxpacket != size) |
1443 | r8a66597_write(r8a66597, BVAL, td->pipe->fifoctr); | 1443 | r8a66597_write(r8a66597, BVAL, td->pipe->fifoctr); |
1444 | } | 1444 | } |
@@ -2306,7 +2306,7 @@ static int r8a66597_bus_resume(struct usb_hcd *hcd) | |||
2306 | 2306 | ||
2307 | dbg("resume port = %d", port); | 2307 | dbg("resume port = %d", port); |
2308 | rh->port &= ~USB_PORT_STAT_SUSPEND; | 2308 | rh->port &= ~USB_PORT_STAT_SUSPEND; |
2309 | rh->port |= USB_PORT_STAT_C_SUSPEND < 16; | 2309 | rh->port |= USB_PORT_STAT_C_SUSPEND << 16; |
2310 | r8a66597_mdfy(r8a66597, RESUME, RESUME | UACT, dvstctr_reg); | 2310 | r8a66597_mdfy(r8a66597, RESUME, RESUME | UACT, dvstctr_reg); |
2311 | msleep(50); | 2311 | msleep(50); |
2312 | r8a66597_mdfy(r8a66597, UACT, RESUME | UACT, dvstctr_reg); | 2312 | r8a66597_mdfy(r8a66597, UACT, RESUME | UACT, dvstctr_reg); |