Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[mv-sheeva.git] / drivers / rtc / rtc-sysfs.c

diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
index 7dd23a6fc8256954b384bfa027e81987e3dd2e29..380083ca572fd480ba0f060c2f9ead3925d855a4 100644 (file)
--- a/drivers/rtc/rtc-sysfs.c
+++ b/drivers/rtc/rtc-sysfs.c
@@ -107,8 +107,9 @@ rtc_sysfs_show_hctosys(struct device *dev, struct device_attribute *attr,
                char *buf)
 {
 #ifdef CONFIG_RTC_HCTOSYS_DEVICE
-       if (strcmp(dev_name(&to_rtc_device(dev)->dev),
-                  CONFIG_RTC_HCTOSYS_DEVICE) == 0)
+       if (rtc_hctosys_ret == 0 &&
+                       strcmp(dev_name(&to_rtc_device(dev)->dev),
+                               CONFIG_RTC_HCTOSYS_DEVICE) == 0)
                return sprintf(buf, "1\n");
        else
 #endif