Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[~andy/linux] / drivers / usb / host / r8a66597-hcd.c

diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 40a0d8b03ad74b38f1658b1b1c6a617fcecf81b7..e84ca1928dbf211f502468a6aa55392b0386741f 100644 (file)
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -959,7 +959,7 @@ static void init_pipe_info(struct r8a66597 *r8a66597, struct urb *urb,
        info.pipenum = get_empty_pipenum(r8a66597, ep);
        info.address = get_urb_to_r8a66597_addr(r8a66597, urb);
        info.epnum = usb_endpoint_num(ep);
-       info.maxpacket = le16_to_cpu(ep->wMaxPacketSize);
+       info.maxpacket = usb_endpoint_maxp(ep);
        info.type = get_r8a66597_type(usb_endpoint_type(ep));
        info.bufnum = get_bufnum(info.pipenum);
        info.buf_bsize = get_buf_bsize(info.pipenum);
@@ -2519,7 +2519,7 @@ static int __devinit r8a66597_probe(struct platform_device *pdev)
        hcd->rsrc_start = res->start;
        hcd->has_tt = 1;
 
-       ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | irq_trigger);
+       ret = usb_add_hcd(hcd, irq, irq_trigger);
        if (ret != 0) {
                dev_err(&pdev->dev, "Failed to add hcd\n");
                goto clean_up3;