Commit 0665e387 authored by Greg Thelen's avatar Greg Thelen Committed by Greg Kroah-Hartman
Browse files

usb: xhci: avoid renesas_usb_fw.mem when it's unusable 



Commit a66d21d7 ("usb: xhci: Add support for Renesas controller with
memory") added renesas_usb_fw.mem firmware reference to xhci-pci.  Thus
modinfo indicates xhci-pci.ko has "firmware: renesas_usb_fw.mem".  But
the firmware is only actually used with CONFIG_USB_XHCI_PCI_RENESAS.  An
unusable firmware reference can trigger safety checkers which look for
drivers with unmet firmware dependencies.

Avoid referring to renesas_usb_fw.mem in circumstances when it cannot be
loaded (when CONFIG_USB_XHCI_PCI_RENESAS isn't set).

Fixes: a66d21d7 ("usb: xhci: Add support for Renesas controller with memory")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Thelen <gthelen@google.com>
Link: https://lore.kernel.org/r/20210702071224.3673568-1-gthelen@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4bb233b7

drivers/usb/host/xhci-pci.c

+7 −0
Original line number Diff line number Diff line
@@ -636,7 +636,14 @@ static const struct pci_device_id pci_ids[] = { 
	{ /* end: all zeroes */ }

};

MODULE_DEVICE_TABLE(pci, pci_ids);



/*

 * Without CONFIG_USB_XHCI_PCI_RENESAS renesas_xhci_check_request_fw() won't

 * load firmware, so don't encumber the xhci-pci driver with it.

 */

#if IS_ENABLED(CONFIG_USB_XHCI_PCI_RENESAS)

MODULE_FIRMWARE("renesas_usb_fw.mem");

#endif



/* pci driver glue; this is a "new style" PCI driver module */

static struct pci_driver xhci_pci_driver = {