diff options
Diffstat (limited to 'drivers/watchdog/sch311x_wdt.c')
-rw-r--r-- | drivers/watchdog/sch311x_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c index 0461858e07d0..c7cf4b01f58d 100644 --- a/drivers/watchdog/sch311x_wdt.c +++ b/drivers/watchdog/sch311x_wdt.c | |||
@@ -201,7 +201,7 @@ static void sch311x_wdt_get_status(int *status) | |||
201 | spin_lock(&sch311x_wdt_data.io_lock); | 201 | spin_lock(&sch311x_wdt_data.io_lock); |
202 | 202 | ||
203 | /* -- Watchdog timer control -- | 203 | /* -- Watchdog timer control -- |
204 | * Bit 0 Status Bit: 0 = Timer counting, 1 = Timeout occured | 204 | * Bit 0 Status Bit: 0 = Timer counting, 1 = Timeout occurred |
205 | * Bit 1 Reserved | 205 | * Bit 1 Reserved |
206 | * Bit 2 Force Timeout: 1 = Forces WD timeout event (self-cleaning) | 206 | * Bit 2 Force Timeout: 1 = Forces WD timeout event (self-cleaning) |
207 | * Bit 3 P20 Force Timeout enabled: | 207 | * Bit 3 P20 Force Timeout enabled: |
@@ -508,7 +508,7 @@ static int __init sch311x_detect(int sio_config_port, unsigned short *addr) | |||
508 | sch311x_sio_outb(sio_config_port, 0x07, 0x0a); | 508 | sch311x_sio_outb(sio_config_port, 0x07, 0x0a); |
509 | 509 | ||
510 | /* Check if Logical Device Register is currently active */ | 510 | /* Check if Logical Device Register is currently active */ |
511 | if (sch311x_sio_inb(sio_config_port, 0x30) && 0x01 == 0) | 511 | if ((sch311x_sio_inb(sio_config_port, 0x30) & 0x01) == 0) |
512 | printk(KERN_INFO PFX "Seems that LDN 0x0a is not active...\n"); | 512 | printk(KERN_INFO PFX "Seems that LDN 0x0a is not active...\n"); |
513 | 513 | ||
514 | /* Get the base address of the runtime registers */ | 514 | /* Get the base address of the runtime registers */ |