|
@@ -2319,11 +2319,12 @@ static int usb_enumerate_device(struct usb_device *udev)
|
|
|
return err;
|
|
|
|
|
|
if (IS_ENABLED(CONFIG_USB_OTG_WHITELIST) && hcd->tpl_support &&
|
|
|
- !is_targeted(udev) && IS_ENABLED(CONFIG_USB_OTG)) {
|
|
|
+ !is_targeted(udev)) {
|
|
|
/* Maybe it can talk to us, though we can't talk to it.
|
|
|
* (Includes HNP test device.)
|
|
|
*/
|
|
|
- if (udev->bus->b_hnp_enable || udev->bus->is_b_host) {
|
|
|
+ if (IS_ENABLED(CONFIG_USB_OTG) && (udev->bus->b_hnp_enable
|
|
|
+ || udev->bus->is_b_host)) {
|
|
|
err = usb_port_suspend(udev, PMSG_AUTO_SUSPEND);
|
|
|
if (err < 0)
|
|
|
dev_dbg(&udev->dev, "HNP fail, %d\n", err);
|