From ff9f09be4591f20638642a773b791ac197e27b2d Mon Sep 17 00:00:00 2001
From: Feng Tang <feng.tang@intel.com>
Date: Wed, 16 Jan 2013 00:09:48 +0800
Subject: [PATCH] --- yaml --- r: 350164 b: refs/heads/master c:
 9ecf37eb7a81e3295a1b274eafb6f83d7d2cabf0 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/rtc/class.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2f00fc384075..9e1189363054 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31ade30692dc9680bfc95700d794818fa3f754ac
+refs/heads/master: 9ecf37eb7a81e3295a1b274eafb6f83d7d2cabf0
diff --git a/trunk/drivers/rtc/class.c b/trunk/drivers/rtc/class.c
index f8a0aab218cb..c01773f56435 100644
--- a/trunk/drivers/rtc/class.c
+++ b/trunk/drivers/rtc/class.c
@@ -50,6 +50,10 @@ static int rtc_suspend(struct device *dev, pm_message_t mesg)
 	struct rtc_device	*rtc = to_rtc_device(dev);
 	struct rtc_time		tm;
 	struct timespec		delta, delta_delta;
+
+	if (has_persistent_clock())
+		return 0;
+
 	if (strcmp(dev_name(&rtc->dev), CONFIG_RTC_HCTOSYS_DEVICE) != 0)
 		return 0;
 
@@ -88,6 +92,9 @@ static int rtc_resume(struct device *dev)
 	struct timespec		new_system, new_rtc;
 	struct timespec		sleep_time;
 
+	if (has_persistent_clock())
+		return 0;
+
 	rtc_hctosys_ret = -ENODEV;
 	if (strcmp(dev_name(&rtc->dev), CONFIG_RTC_HCTOSYS_DEVICE) != 0)
 		return 0;