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 tag 'usb-6.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB fixes from Greg KH:
"Here are some small USB driver fixes for 6.2-rc3 that resolve some
reported issues. They include:

- of-reported ulpi problem, so the offending commit is reverted

- dwc3 driver bugfixes for recent changes

- fotg210 fixes

Most of these have been in linux-next for a while, the last few were
on the mailing list for a long time and passed all the 0-day bot
testing so all should be fine with them as well"

* tag 'usb-6.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
usb: dwc3: gadget: Ignore End Transfer delay on teardown
usb: dwc3: xilinx: include linux/gpio/consumer.h
usb: fotg210-udc: fix error return code in fotg210_udc_probe()
usb: fotg210: fix OTG-only build
Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout"

Linus Torvalds c28bdeaf 4a4dcea0

+9 -6
+1 -1
drivers/usb/common/ulpi.c
··· 207 207 /* Test the interface */ 208 208 ret = ulpi_write(ulpi, ULPI_SCRATCH, 0xaa); 209 209 if (ret < 0) 210 - return ret; 210 + goto err; 211 211 212 212 ret = ulpi_read(ulpi, ULPI_SCRATCH); 213 213 if (ret < 0)
+1
drivers/usb/dwc3/dwc3-xilinx.c
··· 13 13 #include <linux/of.h> 14 14 #include <linux/platform_device.h> 15 15 #include <linux/dma-mapping.h> 16 + #include <linux/gpio/consumer.h> 16 17 #include <linux/of_gpio.h> 17 18 #include <linux/of_platform.h> 18 19 #include <linux/pm_runtime.h>
+4 -1
drivers/usb/dwc3/gadget.c
··· 1727 1727 else if (!ret) 1728 1728 dep->flags |= DWC3_EP_END_TRANSFER_PENDING; 1729 1729 1730 + dep->flags &= ~DWC3_EP_DELAY_STOP; 1730 1731 return ret; 1731 1732 } 1732 1733 ··· 3733 3732 if (dep->number <= 1 && dwc->ep0state != EP0_DATA_PHASE) 3734 3733 return; 3735 3734 3735 + if (interrupt && (dep->flags & DWC3_EP_DELAY_STOP)) 3736 + return; 3737 + 3736 3738 if (!(dep->flags & DWC3_EP_TRANSFER_STARTED) || 3737 - (dep->flags & DWC3_EP_DELAY_STOP) || 3738 3739 (dep->flags & DWC3_EP_END_TRANSFER_PENDING)) 3739 3740 return; 3740 3741
+1 -4
drivers/usb/fotg210/fotg210-core.c
··· 144 144 145 145 static int __init fotg210_init(void) 146 146 { 147 - if (usb_disabled()) 148 - return -ENODEV; 149 - 150 - if (IS_ENABLED(CONFIG_USB_FOTG210_HCD)) 147 + if (IS_ENABLED(CONFIG_USB_FOTG210_HCD) && !usb_disabled()) 151 148 fotg210_hcd_init(); 152 149 return platform_driver_register(&fotg210_driver); 153 150 }
+2
drivers/usb/fotg210/fotg210-udc.c
··· 1201 1201 dev_info(dev, "found and initialized PHY\n"); 1202 1202 } 1203 1203 1204 + ret = -ENOMEM; 1205 + 1204 1206 for (i = 0; i < FOTG210_MAX_NUM_EP; i++) { 1205 1207 fotg210->ep[i] = kzalloc(sizeof(struct fotg210_ep), GFP_KERNEL); 1206 1208 if (!fotg210->ep[i])