diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-06 08:33:30 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-06 08:33:30 +0100 |
| commit | 924fb3ec50f5156d21e4f484358fb36f75b91ca8 (patch) | |
| tree | f36b768432fe7f7c07b28857533e1bfe16006abe /drivers/usb/fotg210 | |
| parent | 4f6dfc2136fb2e8dc3f571a5caff6b6e88281fc0 (diff) | |
| parent | 4ec5183ec48656cec489c49f989c508b68b518e3 (diff) | |
| download | lwn-924fb3ec50f5156d21e4f484358fb36f75b91ca8.tar.gz lwn-924fb3ec50f5156d21e4f484358fb36f75b91ca8.zip | |
Merge 6.2-rc7 into usb-next
We need the USB fixes in here, and this resolves a merge conflict with
the i915 driver as reported in linux-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/fotg210')
| -rw-r--r-- | drivers/usb/fotg210/fotg210-udc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/fotg210/fotg210-udc.c b/drivers/usb/fotg210/fotg210-udc.c index 9034eaf773ad..f7ea84070554 100644 --- a/drivers/usb/fotg210/fotg210-udc.c +++ b/drivers/usb/fotg210/fotg210-udc.c @@ -1010,7 +1010,6 @@ static int fotg210_udc_start(struct usb_gadget *g, int ret; /* hook up the driver */ - driver->driver.bus = NULL; fotg210->driver = driver; fotg210->gadget.dev.of_node = fotg210->dev->of_node; fotg210->gadget.speed = USB_SPEED_UNKNOWN; |