diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-11 12:56:53 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-11 12:56:53 +0400 |
| commit | 9cf22e80df77b3f8459559e156f6322657e17090 (patch) | |
| tree | 22021240398c83286234dbc18200c90e446e7ad6 /drivers | |
| parent | d6d211db37e75de2ddc3a4f979038c40df7cc79c (diff) | |
| parent | dd18dbc2d42af75fffa60c77e0f02220bc329829 (diff) | |
| download | linux-9cf22e80df77b3f8459559e156f6322657e17090.tar.xz | |
Merge branch 'akpm' (incoming from Andrew)
Merge misc fixes from Andrew Morton:
"4 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm, thp: close race between mremap() and split_huge_page()
mm: postpone the disabling of kmemleak early logging
MAINTAINERS: update maintainership of LTP
drivers/rtc/rtc-hym8563.c: set uie_unsupported
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rtc/rtc-hym8563.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-hym8563.c b/drivers/rtc/rtc-hym8563.c index bd628a6f981d..e5f13c4310fe 100644 --- a/drivers/rtc/rtc-hym8563.c +++ b/drivers/rtc/rtc-hym8563.c @@ -569,6 +569,9 @@ static int hym8563_probe(struct i2c_client *client, if (IS_ERR(hym8563->rtc)) return PTR_ERR(hym8563->rtc); + /* the hym8563 alarm only supports a minute accuracy */ + hym8563->rtc->uie_unsupported = 1; + #ifdef CONFIG_COMMON_CLK hym8563_clkout_register_clk(hym8563); #endif |