From b007639156068c5ad6611d00044a3132a8007e9f Mon Sep 17 00:00:00 2001 From: Wim Van Sebroeck Date: Mon, 21 Feb 2011 19:09:40 +0000 Subject: [PATCH] --- yaml --- r: 234103 b: refs/heads/master c: a450c786a5769745cc8fa873a66ed3c377875ead h: refs/heads/master i: 234101: a9f1942233aa66363b97bb975d80f4ef3dd797b0 234099: e5af757e99c735211d495b0d9bb5a6ebd05089e8 234095: ae55611582c83478eedda9a7ff315ea277a509e9 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/sch311x_wdt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d8ebd77304d7..f27107de5633 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bbd562d717a84c6464211e8bd5efa0d9e25edc6d +refs/heads/master: a450c786a5769745cc8fa873a66ed3c377875ead diff --git a/trunk/drivers/watchdog/sch311x_wdt.c b/trunk/drivers/watchdog/sch311x_wdt.c index 0461858e07d0..7b687e9497f0 100644 --- a/trunk/drivers/watchdog/sch311x_wdt.c +++ b/trunk/drivers/watchdog/sch311x_wdt.c @@ -508,7 +508,7 @@ static int __init sch311x_detect(int sio_config_port, unsigned short *addr) sch311x_sio_outb(sio_config_port, 0x07, 0x0a); /* Check if Logical Device Register is currently active */ - if (sch311x_sio_inb(sio_config_port, 0x30) && 0x01 == 0) + if (sch311x_sio_inb(sio_config_port, 0x30) & 0x01 == 0) printk(KERN_INFO PFX "Seems that LDN 0x0a is not active...\n"); /* Get the base address of the runtime registers */