summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony LIU <junjie.liu@freescale.com>2012-04-05 14:11:13 +0800
committerTony LIU <junjie.liu@freescale.com>2012-04-06 10:22:11 +0800
commit53ad925abb6a4880703399220125750fb0b9753e (patch)
tree104ee9957815cacf7a267b2baa0e74d1278a5b78
parent2f72606eaee03e24fb1c686fa200682e558d1bca (diff)
ENGR00178939 [mx6] usb host, msleep may be called in atomic context
- change msleep(1) to udelay(500) - msleep may be called in atomic context, which will cause warning message Signed-off-by: Tony LIU <junjie.liu@freescale.com>
-rw-r--r--arch/arm/mach-mx6/usb_dr.c4
-rw-r--r--arch/arm/mach-mx6/usb_h1.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-mx6/usb_dr.c b/arch/arm/mach-mx6/usb_dr.c
index 3a8a3a7ec242..24c8cb9c4d31 100644
--- a/arch/arm/mach-mx6/usb_dr.c
+++ b/arch/arm/mach-mx6/usb_dr.c
@@ -415,14 +415,14 @@ static void _host_platform_rh_resume(struct fsl_usb2_platform_data *pdata)
while ((UOG_PORTSC1 & PORTSC_PORT_FORCE_RESUME)
&& (index < 1000)) {
- msleep(1);
+ udelay(500);
index++;
}
if (index >= 1000)
printk(KERN_INFO "%s big error\n", __func__);
- msleep(1);
+ udelay(500);
fsl_platform_otg_set_usb_phy_dis(pdata, 1);
}
diff --git a/arch/arm/mach-mx6/usb_h1.c b/arch/arm/mach-mx6/usb_h1.c
index 4d9d1527a0b1..478ead40cf0d 100644
--- a/arch/arm/mach-mx6/usb_h1.c
+++ b/arch/arm/mach-mx6/usb_h1.c
@@ -243,14 +243,14 @@ static void usbh1_platform_rh_resume(struct fsl_usb2_platform_data *pdata)
while ((UH1_PORTSC1 & PORTSC_PORT_FORCE_RESUME)
&& (index < 1000)) {
- msleep(1);
+ udelay(500);
index++;
}
if (index >= 1000)
printk(KERN_INFO "%s big error\n", __func__);
- msleep(1);
+ udelay(500);
fsl_platform_h1_set_usb_phy_dis(pdata, 1);
}