USB: fix Kconfig logic for USB_UHCI_HCD (ccd9509a) · Commits · 戴 / test

The Kconfig settings for uhci-hcd are too permissive; they allow the driver to be built without any bus-glue modules configured (USB_UHCI_HCD enabled, PCI disabled, SPARC_LEON disabled, ARCH_VT8500 enabled, and USB_UHCI_PLATFORM disabled). This patch fixes the problem by rearranging the dependencies. Now the platform-dependent config options don't depend on USB_UHCI_HCD; instead it depends on them. Furthermore, there is no user-selectable choice as to which glue modules will be built. If USB_UHCI_HCD is enabled then all applicable bus glues will be built. Signed-off-by:

Alan Stern <stern@rowland.harvard.edu> CC: Arnd Bergmann <arnd@arndb.de> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/usb/host/Kconfig

+5 −12

Original line number	Diff line number	Diff line
		@@ -507,7 +507,7 @@ endif # USB_OHCI_HCD

		config USB_UHCI_HCD
		tristate "UHCI HCD (most Intel and VIA) support"
		depends on PCI \|\| SPARC_LEON \|\| ARCH_VT8500
		depends on PCI \|\| USB_UHCI_SUPPORT_NON_PCI_HC
		---help---
		The Universal Host Controller Interface is a standard by Intel for
		accessing the USB hardware in the PC (which is also called the USB
		@@ -524,26 +524,19 @@ config USB_UHCI_HCD

		config USB_UHCI_SUPPORT_NON_PCI_HC
		bool
		depends on USB_UHCI_HCD
		default y if (SPARC_LEON \|\| ARCH_VT8500)
		default y if (SPARC_LEON \|\| USB_UHCI_PLATFORM)

		config USB_UHCI_PLATFORM
		bool "Generic UHCI Platform Driver support"
		depends on USB_UHCI_SUPPORT_NON_PCI_HC
		bool
		default y if ARCH_VT8500
		---help---
		Enable support for generic UHCI platform devices that require no
		additional configuration.

		config USB_UHCI_BIG_ENDIAN_MMIO
		bool
		depends on USB_UHCI_SUPPORT_NON_PCI_HC && SPARC_LEON
		default y
		default y if SPARC_LEON

		config USB_UHCI_BIG_ENDIAN_DESC
		bool
		depends on USB_UHCI_SUPPORT_NON_PCI_HC && SPARC_LEON
		default y
		default y if SPARC_LEON

		config USB_FHCI_HCD
		tristate "Freescale QE USB Host Controller support"

Admin message