These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / rtc / rtc-isl12022.c

diff --git a/kernel/drivers/rtc/rtc-isl12022.c b/kernel/drivers/rtc/rtc-isl12022.c
index f9b0827..839d1fd 100644 (file)
--- a/kernel/drivers/rtc/rtc-isl12022.c
+++ b/kernel/drivers/rtc/rtc-isl12022.c
@@ -151,12 +151,7 @@ static int isl12022_get_datetime(struct i2c_client *client, struct rtc_time *tm)
                tm->tm_sec, tm->tm_min, tm->tm_hour,
                tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
 
-       /* The clock can give out invalid datetime, but we cannot return
-        * -EINVAL otherwise hwclock will refuse to set the time on bootup. */
-       if (rtc_valid_tm(tm) < 0)
-               dev_err(&client->dev, "retrieved date and time is invalid.\n");
-
-       return 0;
+       return rtc_valid_tm(tm);
 }
 
 static int isl12022_set_datetime(struct i2c_client *client, struct rtc_time *tm)
@@ -279,6 +274,7 @@ static const struct of_device_id isl12022_dt_match[] = {
        { .compatible = "isil,isl12022" },
        { },
 };
+MODULE_DEVICE_TABLE(of, isl12022_dt_match);
 #endif
 
 static const struct i2c_device_id isl12022_id[] = {