diff options
| author | Paul Cercueil <paul@crapouillou.net> | 2019-04-30 09:59:35 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-30 17:55:08 +0200 |
| commit | 41386bc8cb2e0943cbeaa63e1fdb6b66a874ca90 (patch) | |
| tree | b4ca627a38018fa21a43d2c7279c7e7f7c267982 /drivers/usb/musb | |
| parent | b063f04e0d2e7a808f6b5827bd1e39ad89617a22 (diff) | |
| download | linux-41386bc8cb2e0943cbeaa63e1fdb6b66a874ca90.tar.gz linux-41386bc8cb2e0943cbeaa63e1fdb6b66a874ca90.tar.bz2 linux-41386bc8cb2e0943cbeaa63e1fdb6b66a874ca90.zip | |
usb: musb: Silence error about blacklisting hubs if !CONFIG_USB
Some drivers, like jz4740-musb, don't depend on CONFIG_USB.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/musb')
| -rw-r--r-- | drivers/usb/musb/musb_core.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index b7d56272f9d1..9f5a4819a744 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -1497,10 +1497,11 @@ static int musb_core_init(u16 musb_type, struct musb *musb) } else { musb->is_multipoint = 0; type = ""; -#ifndef CONFIG_USB_OTG_BLACKLIST_HUB - pr_err("%s: kernel must blacklist external hubs\n", - musb_driver_name); -#endif + if (IS_ENABLED(CONFIG_USB) && + !IS_ENABLED(CONFIG_USB_OTG_BLACKLIST_HUB)) { + pr_err("%s: kernel must blacklist external hubs\n", + musb_driver_name); + } } /* log release info */ |