diff options
author | Jani Nikula <jani.nikula@intel.com> | 2018-05-02 12:20:32 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2018-05-02 12:20:32 +0300 |
commit | 53f071e19d566e7d0a4eada1bd8313a4cdb660a4 (patch) | |
tree | ee2aecae90ec29ab404cf60bedeb3feb2ec99966 /drivers/rtc/rtc-max6902.c | |
parent | 043477b088d2af61a0937754c6560002237e6741 (diff) | |
parent | 0ab390262c4920f26f8202063a268d5fc829728e (diff) | |
download | linux-53f071e19d566e7d0a4eada1bd8313a4cdb660a4.tar.xz |
Merge drm/drm-next into drm-intel-next-queued
Need d224985a5e31 ("sched/wait, drivers/drm: Convert wait_on_atomic_t()
usage to the new wait_var_event() API") in dinq to be able to fix
https://bugs.freedesktop.org/show_bug.cgi?id=106085.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/rtc/rtc-max6902.c')
-rw-r--r-- | drivers/rtc/rtc-max6902.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c index 315d09e0f2c1..745827463367 100644 --- a/drivers/rtc/rtc-max6902.c +++ b/drivers/rtc/rtc-max6902.c @@ -85,7 +85,7 @@ static int max6902_read_time(struct device *dev, struct rtc_time *dt) dt->tm_year += century; dt->tm_year -= 1900; - return rtc_valid_tm(dt); + return 0; } static int max6902_set_time(struct device *dev, struct rtc_time *dt) |