down_trylock -> down_try in drivers/watchdog/sc1200wdt.c Signed-off-by: Rusty Russell --- drivers/watchdog/sc1200wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -r 0eca42b9eeab drivers/watchdog/sc1200wdt.c --- a/drivers/watchdog/sc1200wdt.c Tue May 06 10:17:33 2008 +1000 +++ b/drivers/watchdog/sc1200wdt.c Tue May 06 10:25:00 2008 +1000 @@ -151,7 +151,7 @@ static int sc1200wdt_open(struct inode * static int sc1200wdt_open(struct inode *inode, struct file *file) { /* allow one at a time */ - if (down_trylock(&open_sem)) + if (!down_try(&open_sem)) return -EBUSY; if (timeout > MAX_TIMEOUT)