tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds b3b1b70e abe8809c

+9 -8
+1 -1
drivers/usb/dwc3/core.c
··· 264 264 ret = -ENODEV; 265 265 goto err0; 266 266 } 267 - dwc->revision = reg & DWC3_GSNPSREV_MASK; 267 + dwc->revision = reg; 268 268 269 269 dwc3_core_soft_reset(dwc); 270 270
-3
drivers/usb/gadget/epautoconf.c
··· 130 130 num_req_streams = ep_comp->bmAttributes & 0x1f; 131 131 if (num_req_streams > ep->max_streams) 132 132 return 0; 133 - /* Update the ep_comp descriptor if needed */ 134 - if (num_req_streams != ep->max_streams) 135 - ep_comp->bmAttributes = ep->max_streams; 136 133 } 137 134 138 135 }
+4 -4
drivers/usb/host/isp1760-if.c
··· 18 18 19 19 #include "isp1760-hcd.h" 20 20 21 - #ifdef CONFIG_OF 21 + #if defined(CONFIG_OF) && defined(CONFIG_OF_IRQ) 22 22 #include <linux/slab.h> 23 23 #include <linux/of.h> 24 24 #include <linux/of_platform.h> ··· 31 31 #include <linux/pci.h> 32 32 #endif 33 33 34 - #ifdef CONFIG_OF 34 + #if defined(CONFIG_OF) && defined(CONFIG_OF_IRQ) 35 35 struct isp1760 { 36 36 struct usb_hcd *hcd; 37 37 int rst_gpio; ··· 437 437 ret = platform_driver_register(&isp1760_plat_driver); 438 438 if (!ret) 439 439 any_ret = 0; 440 - #ifdef CONFIG_OF 440 + #if defined(CONFIG_OF) && defined(CONFIG_OF_IRQ) 441 441 ret = platform_driver_register(&isp1760_of_driver); 442 442 if (!ret) 443 443 any_ret = 0; ··· 457 457 static void __exit isp1760_exit(void) 458 458 { 459 459 platform_driver_unregister(&isp1760_plat_driver); 460 - #ifdef CONFIG_OF 460 + #if defined(CONFIG_OF) && defined(CONFIG_OF_IRQ) 461 461 platform_driver_unregister(&isp1760_of_driver); 462 462 #endif 463 463 #ifdef CONFIG_PCI
+4
drivers/usb/musb/musb_host.c
··· 774 774 if (musb->double_buffer_not_ok) 775 775 musb_writew(epio, MUSB_TXMAXP, 776 776 hw_ep->max_packet_sz_tx); 777 + else if (can_bulk_split(musb, qh->type)) 778 + musb_writew(epio, MUSB_TXMAXP, packet_sz 779 + | ((hw_ep->max_packet_sz_tx / 780 + packet_sz) - 1) << 11); 777 781 else 778 782 musb_writew(epio, MUSB_TXMAXP, 779 783 qh->maxpacket |