down_trylock -> down_try in drivers/watchdog/ar7_wdt.c Signed-off-by: Rusty Russell --- drivers/watchdog/ar7_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -r e0959f913a66 drivers/watchdog/ar7_wdt.c --- a/drivers/watchdog/ar7_wdt.c Tue May 06 10:17:33 2008 +1000 +++ b/drivers/watchdog/ar7_wdt.c Tue May 06 10:26:02 2008 +1000 @@ -179,7 +179,7 @@ static int ar7_wdt_open(struct inode *in static int ar7_wdt_open(struct inode *inode, struct file *file) { /* only allow one at a time */ - if (down_trylock(&open_semaphore)) + if (!down_try(&open_semaphore)) return -EBUSY; ar7_wdt_enable_wdt(); expect_close = 0;