Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[pandora-kernel.git] / drivers / usb / host / r8a66597-hcd.c

diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 4586369..40a0d8b 100644 (file)
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -6,7 +6,7 @@
  * Portions Copyright (C) 2004-2005 David Brownell
  * Portions Copyright (C) 1999 Roman Weissgaerber
  *
- * Author : Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
+ * Author : Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * 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)
        if (pipenum > 0)
                r8a66597_write(r8a66597, ~(1 << pipenum), BEMPSTS);
        if (urb->transfer_buffer) {
-               r8a66597_write_fifo(r8a66597, td->pipe->fifoaddr, buf, size);
+               r8a66597_write_fifo(r8a66597, td->pipe, buf, size);
                if (!usb_pipebulk(urb->pipe) || td->maxpacket != size)
                        r8a66597_write(r8a66597, BVAL, td->pipe->fifoctr);
        }
@@ -2306,7 +2306,7 @@ static int r8a66597_bus_resume(struct usb_hcd *hcd)
 
                dbg("resume port = %d", port);
                rh->port &= ~USB_PORT_STAT_SUSPEND;
-               rh->port |= USB_PORT_STAT_C_SUSPEND < 16;
+               rh->port |= USB_PORT_STAT_C_SUSPEND << 16;
                r8a66597_mdfy(r8a66597, RESUME, RESUME | UACT, dvstctr_reg);
                msleep(50);
                r8a66597_mdfy(r8a66597, UACT, RESUME | UACT, dvstctr_reg);