From fab53eaa0588d82ad5a6657985cc775f4c3be453 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 10 Jan 2012 15:10:41 -0800 Subject: [PATCH] --- yaml --- r: 283090 b: refs/heads/master c: 012e52e15e7ebbc7b08165e8f4b10f71a3e6810b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-ab8500.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1b36fb23fc8f..b24baf01a309 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b62581e6241c33b9fef45117f86830058738371f +refs/heads/master: 012e52e15e7ebbc7b08165e8f4b10f71a3e6810b diff --git a/trunk/drivers/rtc/rtc-ab8500.c b/trunk/drivers/rtc/rtc-ab8500.c index 82a348095a71..919b2e5cb7f0 100644 --- a/trunk/drivers/rtc/rtc-ab8500.c +++ b/trunk/drivers/rtc/rtc-ab8500.c @@ -90,7 +90,7 @@ static int ab8500_rtc_read_time(struct device *dev, struct rtc_time *tm) /* Early AB8500 chips will not clear the rtc read request bit */ if (abx500_get_chip_id(dev) == 0) { - msleep(1); + usleep_range(1000, 1000); } else { /* Wait for some cycles after enabling the rtc read in ab8500 */ while (time_before(jiffies, timeout)) { @@ -102,7 +102,7 @@ static int ab8500_rtc_read_time(struct device *dev, struct rtc_time *tm) if (!(value & RTC_READ_REQUEST)) break; - msleep(1); + usleep_range(1000, 5000); } } @@ -295,7 +295,7 @@ static int __devinit ab8500_rtc_probe(struct platform_device *pdev) return err; /* Wait for reset by the PorRtc */ - msleep(1); + usleep_range(1000, 5000); err = abx500_get_register_interruptible(&pdev->dev, AB8500_RTC, AB8500_RTC_STAT_REG, &rtc_ctrl);