---

yaml --- r: 349700 b: refs/heads/master c: 3399cfb h: refs/heads/master v: v3
git-mirror · Feb 12, 2013 · 4e51264 · 4e51264
1 parent 32f5c75
commit 4e51264
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 211b0cdc7dc574e5e756bdf1cc2f4a16b7f6e07e
+refs/heads/master: 3399cfb5df9594495b876d1843a7165f77366b2b
diff --git a/trunk/drivers/rtc/rtc-pl031.c b/trunk/drivers/rtc/rtc-pl031.c
@@ -350,7 +350,9 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
 	/* Enable the clockwatch on ST Variants */
 	if (vendor->clockwatch)
 		data |= RTC_CR_CWEN;
-	writel(data | RTC_CR_EN, ldata->base + RTC_CR);
+	else
+		data |= RTC_CR_EN;
+	writel(data, ldata->base + RTC_CR);
 
 	/*
 	 * On ST PL031 variants, the RTC reset value does not provide correct