Patchwork Re: [PATCH] NUC900/rtc: change the waiting for device ready implement

login
register
mail settings
Submitter Wan ZongShun
Date May 18, 2010, 9:24 a.m.
Message ID <4BF25CB2.3020801@gmail.com>
Download mbox | patch
Permalink /patch/52856/
State New
Headers show

Comments

Wan ZongShun - May 18, 2010, 9:24 a.m.
Dear sir,

Re-submitting the patch to fix careless bug.


Signed-off-by:Wan ZongShun<mcuos.com@gmail.com>

---
 drivers/rtc/rtc-nuc900.c |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

Patch

diff --git a/drivers/rtc/rtc-nuc900.c b/drivers/rtc/rtc-nuc900.c
index a351bd5..21d1330 100644
--- a/drivers/rtc/rtc-nuc900.c
+++ b/drivers/rtc/rtc-nuc900.c
@@ -85,22 +85,21 @@  static irqreturn_t nuc900_rtc_interrupt(int irq, void *_rtc)

 static int *check_rtc_access_enable(struct nuc900_rtc *nuc900_rtc)
 {
-	unsigned int i;
+	unsigned int i, timeout = 0x1000;
 	__raw_writel(INIRRESET, nuc900_rtc->rtc_reg + REG_RTC_INIR);

 	mdelay(10);

 	__raw_writel(AERPOWERON, nuc900_rtc->rtc_reg + REG_RTC_AER);

-	for (i = 0; i < 1000; i++) {
-		if (__raw_readl(nuc900_rtc->rtc_reg + REG_RTC_AER) & AERRWENB)
-			return 0;
-	}
+	while (!(__raw_readl(nuc900_rtc->rtc_reg + REG_RTC_AER) & AERRWENB)
+								&& timeout--)
+		mdelay(1);

-	if ((__raw_readl(nuc900_rtc->rtc_reg + REG_RTC_AER) & AERRWENB) == 0x0)
-		return ERR_PTR(-ENODEV);
+	if (!timeout)
+		return ERR_PTR(-EPERM);

-	return ERR_PTR(-EPERM);
+	return 0;
 }

 static void nuc900_rtc_bcd2bin(unsigned int timereg,