Merge tag 'rtc-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

[sfrench/cifs-2.6.git] / drivers / rtc / rtc-m41t80.c

diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index 5f46f85f814b12d94c9e1cafc8ae9bc0b79e79cf..9b70b371bd0c379ef9564d5db0e193973062e975 100644 (file)
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -235,9 +235,6 @@ static int m41t80_rtc_set_time(struct device *dev, struct rtc_time *tm)
        unsigned char buf[8];
        int err, flags;
 
-       if (tm->tm_year < 100 || tm->tm_year > 199)
-               return -EINVAL;
-
        buf[M41T80_REG_SSEC] = 0;
        buf[M41T80_REG_SEC] = bin2bcd(tm->tm_sec);
        buf[M41T80_REG_MIN] = bin2bcd(tm->tm_min);
@@ -705,7 +702,6 @@ static ssize_t wdt_read(struct file *file, char __user *buf,
 
 /**
  *     wdt_ioctl:
- *     @inode: inode of the device
  *     @file: file handle to the device
  *     @cmd: watchdog command
  *     @arg: argument pointer
@@ -840,6 +836,7 @@ static const struct file_operations wdt_fops = {
        .owner  = THIS_MODULE,
        .read   = wdt_read,
        .unlocked_ioctl = wdt_unlocked_ioctl,
+       .compat_ioctl = compat_ptr_ioctl,
        .write  = wdt_write,
        .open   = wdt_open,
        .release = wdt_release,
@@ -925,6 +922,8 @@ static int m41t80_probe(struct i2c_client *client,
        }
 
        m41t80_data->rtc->ops = &m41t80_rtc_ops;
+       m41t80_data->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
+       m41t80_data->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
        if (client->irq <= 0) {
                /* We cannot support UIE mode if we do not have an IRQ line */