diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:39:12 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:39:12 -0700 |
| commit | 373cea9e2c9c6495a80efdae55cf2114f384a75b (patch) | |
| tree | 7a8c31aff389cd60937edf7d311c2d93d42a3c7d /drivers/usb/musb/musb_virthub.c | |
| parent | ea64087da6e7655f5acac074a70496b50b310a29 (diff) | |
| parent | 8a7eb06341c73248d152a2a12e4f00f472295de7 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-15.08-rt
Diffstat (limited to 'drivers/usb/musb/musb_virthub.c')
| -rw-r--r-- | drivers/usb/musb/musb_virthub.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c index 0241a3a0d63e..1e9bde4fe785 100644 --- a/drivers/usb/musb/musb_virthub.c +++ b/drivers/usb/musb/musb_virthub.c @@ -273,9 +273,7 @@ static int musb_has_gadget(struct musb *musb) #ifdef CONFIG_USB_MUSB_HOST return 1; #else - if (musb->port_mode == MUSB_PORT_MODE_HOST) - return 1; - return musb->g.dev.driver != NULL; + return musb->port_mode == MUSB_PORT_MODE_HOST; #endif } |