On Sun, Jul 23, 2023 at 09:35:45PM -0400, Sasha Levin wrote: > From: Mathias Nyman <mathias.nyman@xxxxxxxxxxxxxxx> > > [ Upstream commit 9b907c91aa94522ae14bf155ce7b9ccb10a0903c ] > > Not all platforms drivers need to set up custom quirks during the xhci > generic setup. Allow them to pass NULL as the function pointer when > calling xhci_gen_setup() > > Signed-off-by: Mathias Nyman <mathias.nyman@xxxxxxxxxxxxxxx> > Message-ID: <20230602144009.1225632-4-mathias.nyman@xxxxxxxxxxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > --- > drivers/usb/host/xhci.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c > index 0f2b67f38d2ea..3feee0419fdd9 100644 > --- a/drivers/usb/host/xhci.c > +++ b/drivers/usb/host/xhci.c > @@ -4975,7 +4975,8 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks) > > xhci->quirks |= quirks; > > - get_quirks(dev, xhci); > + if (get_quirks) > + get_quirks(dev, xhci); Not needed in 4.14.y, thanks. greg k-h
