i2c: Document the message size limit

[safe/jmp/linux-2.6] / drivers / watchdog / rc32434_wdt.c

diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index bffd4a2..bf12d06 100644 (file)
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -35,7 +35,7 @@
 
 #define PFX KBUILD_MODNAME ": "
 
-#define VERSION "0.5"
+#define VERSION "1.0"
 
 static struct {
        unsigned long inuse;
@@ -62,7 +62,7 @@ extern unsigned int idt_cpu_freq;
 static int timeout = WATCHDOG_TIMEOUT;
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout value, in seconds (default="
-               WATCHDOG_TIMEOUT ")");
+               __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
 
 static int nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, int, 0);
@@ -247,7 +247,7 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,
        return 0;
 }
 
-static struct file_operations rc32434_wdt_fops = {
+static const struct file_operations rc32434_wdt_fops = {
        .owner          = THIS_MODULE,
        .llseek         = no_llseek,
        .write          = rc32434_wdt_write,
@@ -276,7 +276,7 @@ static int __devinit rc32434_wdt_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       wdt_reg = ioremap_nocache(r->start, r->end - r->start);
+       wdt_reg = ioremap_nocache(r->start, resource_size(r));
        if (!wdt_reg) {
                printk(KERN_ERR PFX "failed to remap I/O resources\n");
                return -ENXIO;
@@ -284,6 +284,9 @@ static int __devinit rc32434_wdt_probe(struct platform_device *pdev)
 
        spin_lock_init(&rc32434_wdt_device.io_lock);
 
+       /* Make sure the watchdog is not running */
+       rc32434_wdt_stop();
+
        /* Check that the heartbeat value is within it's range;
         * if not reset to the default */
        if (rc32434_wdt_set(timeout)) {