diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-11 21:45:21 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-11 21:45:21 +0400 |
| commit | 254c44ea822066e24ab5efbdff1e43b8fe45ae76 (patch) | |
| tree | 547f6fd4ce1bd6dba6a5cc5184df28501d550795 /drivers/usb/musb/omap2430.c | |
| parent | 7b76415375ba91f5a06f8d5179278c03d6151d16 (diff) | |
| parent | 6ac77e469e991e9dd91b28e503fa24b5609eedba (diff) | |
| download | linux-254c44ea822066e24ab5efbdff1e43b8fe45ae76.tar.xz | |
Merge branch 'gic-fasteoi' of git://linux-arm.org/linux-2.6-wd into devel-stable
Diffstat (limited to 'drivers/usb/musb/omap2430.c')
| -rw-r--r-- | drivers/usb/musb/omap2430.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index 57a27fa954b4..e9e60b6e0583 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c @@ -270,7 +270,7 @@ static int musb_otg_notifications(struct notifier_block *nb, DBG(4, "VBUS Disconnect\n"); #ifdef CONFIG_USB_GADGET_MUSB_HDRC - if (is_otg_enabled(musb)) + if (is_otg_enabled(musb) || is_peripheral_enabled(musb)) if (musb->gadget_driver) #endif { |