diff options
| author | Alex Gonzalez <alex.gonzalez@digi.com> | 2012-02-23 16:07:02 +0100 |
|---|---|---|
| committer | Alex Gonzalez <alex.gonzalez@digi.com> | 2012-02-27 10:13:24 +0100 |
| commit | 1c822a4fca3227671fdd2ddf2171a521e53d3dc8 (patch) | |
| tree | 3a94a15baa05033e6090c2be51c8cd9b3c5135fa | |
| parent | b644a80452d40a9872c247532c4cf5bceea248cd (diff) | |
mx5: Only register OTG wakeup devices if USB OTG is configured.
Otherwise, even when CONFIG_USB is disabled, the wake up devices are
registered and this could cause problems.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
| -rw-r--r-- | arch/arm/mach-mx5/usb_dr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/usb_dr.c b/arch/arm/mach-mx5/usb_dr.c index b6a721179bfe..30b5f8856b29 100644 --- a/arch/arm/mach-mx5/usb_dr.c +++ b/arch/arm/mach-mx5/usb_dr.c @@ -337,5 +337,7 @@ void __init mx5_usb_dr_init(void) platform_device_register(&mxc_usbdr_udc_device); dr_wakeup_config.usb_pdata[2] = mxc_usbdr_udc_device.dev.platform_data; #endif - mxc_register_device(&mxc_usbdr_wakeup_device, &dr_wakeup_config); + if( dr_utmi_config.wake_up_enable ) + mxc_register_device(&mxc_usbdr_wakeup_device, &dr_wakeup_config); + } |