summaryrefslogtreecommitdiff
path: root/drivers/rtc
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2016-08-22 14:09:08 -0700
committerDmitry Shmidt <dimitrysh@google.com>2016-08-22 14:09:08 -0700
commitaa349c0a96998f651f246581c395069343e3e008 (patch)
tree8f04ac2049a7629100745c331dc569c1f067b062 /drivers/rtc
parent8e4f993802d3d853d5377b9aaa8df28926140077 (diff)
parent85184740541c2b80b72ebfa46cfe065ec1d1058f (diff)
Merge tag 'v4.4.19' into android-4.4.y
This is the 4.4.19 stable release
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-s3c.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index ffb860d18701..f92528822f06 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -149,12 +149,14 @@ static int s3c_rtc_setfreq(struct s3c_rtc *info, int freq)
if (!is_power_of_2(freq))
return -EINVAL;
+ s3c_rtc_enable_clk(info);
spin_lock_irq(&info->pie_lock);
if (info->data->set_freq)
info->data->set_freq(info, freq);
spin_unlock_irq(&info->pie_lock);
+ s3c_rtc_disable_clk(info);
return 0;
}