Commit b3b1b70e authored by Linus Torvalds's avatar Linus Torvalds

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

* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: Fix usb/isp1760 build on sparc
  usb: gadget: epautoconf: do not change number of streams
  usb: dwc3: core: fix cached revision on our structure
  usb: musb: fix reset issue with full speed device
parents abe8809c 341f5b10
...@@ -264,7 +264,7 @@ static int __devinit dwc3_core_init(struct dwc3 *dwc) ...@@ -264,7 +264,7 @@ static int __devinit dwc3_core_init(struct dwc3 *dwc)
ret = -ENODEV; ret = -ENODEV;
goto err0; goto err0;
} }
dwc->revision = reg & DWC3_GSNPSREV_MASK; dwc->revision = reg;
dwc3_core_soft_reset(dwc); dwc3_core_soft_reset(dwc);
......
...@@ -130,9 +130,6 @@ ep_matches ( ...@@ -130,9 +130,6 @@ ep_matches (
num_req_streams = ep_comp->bmAttributes & 0x1f; num_req_streams = ep_comp->bmAttributes & 0x1f;
if (num_req_streams > ep->max_streams) if (num_req_streams > ep->max_streams)
return 0; return 0;
/* Update the ep_comp descriptor if needed */
if (num_req_streams != ep->max_streams)
ep_comp->bmAttributes = ep->max_streams;
} }
} }
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "isp1760-hcd.h" #include "isp1760-hcd.h"
#ifdef CONFIG_OF #if defined(CONFIG_OF) && defined(CONFIG_OF_IRQ)
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#endif #endif
#ifdef CONFIG_OF #if defined(CONFIG_OF) && defined(CONFIG_OF_IRQ)
struct isp1760 { struct isp1760 {
struct usb_hcd *hcd; struct usb_hcd *hcd;
int rst_gpio; int rst_gpio;
...@@ -437,7 +437,7 @@ static int __init isp1760_init(void) ...@@ -437,7 +437,7 @@ static int __init isp1760_init(void)
ret = platform_driver_register(&isp1760_plat_driver); ret = platform_driver_register(&isp1760_plat_driver);
if (!ret) if (!ret)
any_ret = 0; any_ret = 0;
#ifdef CONFIG_OF #if defined(CONFIG_OF) && defined(CONFIG_OF_IRQ)
ret = platform_driver_register(&isp1760_of_driver); ret = platform_driver_register(&isp1760_of_driver);
if (!ret) if (!ret)
any_ret = 0; any_ret = 0;
...@@ -457,7 +457,7 @@ module_init(isp1760_init); ...@@ -457,7 +457,7 @@ module_init(isp1760_init);
static void __exit isp1760_exit(void) static void __exit isp1760_exit(void)
{ {
platform_driver_unregister(&isp1760_plat_driver); platform_driver_unregister(&isp1760_plat_driver);
#ifdef CONFIG_OF #if defined(CONFIG_OF) && defined(CONFIG_OF_IRQ)
platform_driver_unregister(&isp1760_of_driver); platform_driver_unregister(&isp1760_of_driver);
#endif #endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
......
...@@ -774,6 +774,10 @@ static void musb_ep_program(struct musb *musb, u8 epnum, ...@@ -774,6 +774,10 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
if (musb->double_buffer_not_ok) if (musb->double_buffer_not_ok)
musb_writew(epio, MUSB_TXMAXP, musb_writew(epio, MUSB_TXMAXP,
hw_ep->max_packet_sz_tx); hw_ep->max_packet_sz_tx);
else if (can_bulk_split(musb, qh->type))
musb_writew(epio, MUSB_TXMAXP, packet_sz
| ((hw_ep->max_packet_sz_tx /
packet_sz) - 1) << 11);
else else
musb_writew(epio, MUSB_TXMAXP, musb_writew(epio, MUSB_TXMAXP,
qh->maxpacket | qh->maxpacket |
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment