Commit df00731c authored by Vinod Koul's avatar Vinod Koul Committed by Greg Kroah-Hartman

usb: xhci: fix USB_XHCI_PCI depends

The xhci-pci-renesas module exports symbols for xhci-pci to load the
RAM/ROM on renesas xhci controllers. We had dependency which works
when both the modules are builtin or modules.

But if xhci-pci is inbuilt and xhci-pci-renesas in module, we get below
linker error:
drivers/usb/host/xhci-pci.o: In function `xhci_pci_remove':
drivers/usb/host/xhci-pci.c:411: undefined reference to `renesas_xhci_pci_exit'
drivers/usb/host/xhci-pci.o: In function `xhci_pci_probe':
drivers/usb/host/xhci-pci.c:345: undefined reference to `renesas_xhci_check_request_fw'

Fix this by adding USB_XHCI_PCI having depends on USB_XHCI_PCI_RENESAS
|| !USB_XHCI_PCI_RENESAS so that both can be either inbuilt or modules.
Reported-by: default avatarAnders Roxell <anders.roxell@linaro.org>
Fixes: a66d21d7 ("usb: xhci: Add support for Renesas controller with memory")
Tested-by: default avatarAnders Roxell <anders.roxell@linaro.org>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20200519050622.994908-1-vkoul@kernel.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 16bdc04c
...@@ -40,11 +40,11 @@ config USB_XHCI_DBGCAP ...@@ -40,11 +40,11 @@ config USB_XHCI_DBGCAP
config USB_XHCI_PCI config USB_XHCI_PCI
tristate tristate
depends on USB_PCI depends on USB_PCI
depends on USB_XHCI_PCI_RENESAS || !USB_XHCI_PCI_RENESAS
default y default y
config USB_XHCI_PCI_RENESAS config USB_XHCI_PCI_RENESAS
tristate "Support for additional Renesas xHCI controller with firwmare" tristate "Support for additional Renesas xHCI controller with firwmare"
depends on USB_XHCI_PCI
---help--- ---help---
Say 'Y' to enable the support for the Renesas xHCI controller with Say 'Y' to enable the support for the Renesas xHCI controller with
firwmare. Make sure you have the firwmare for the device and firwmare. Make sure you have the firwmare for the device and
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment