down_trylock -> down_nowait in drivers/watchdog/scx200_wdt.c Signed-off-by: Rusty Russell --- drivers/watchdog/scx200_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -r d835657ef62b drivers/watchdog/scx200_wdt.c --- a/drivers/watchdog/scx200_wdt.c Tue May 06 10:17:33 2008 +1000 +++ b/drivers/watchdog/scx200_wdt.c Tue May 06 10:24:41 2008 +1000 @@ -92,7 +92,7 @@ static int scx200_wdt_open(struct inode static int scx200_wdt_open(struct inode *inode, struct file *file) { /* only allow one at a time */ - if (down_trylock(&open_semaphore)) + if (!down_nowait(&open_semaphore)) return -EBUSY; scx200_wdt_enable();