down_trylock -> down_nowait in drivers/net/ps3_gelic_wireless.c Signed-off-by: Rusty Russell --- drivers/net/ps3_gelic_wireless.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -r 3c7fe5532514 drivers/net/ps3_gelic_wireless.c --- a/drivers/net/ps3_gelic_wireless.c Tue May 06 10:17:33 2008 +1000 +++ b/drivers/net/ps3_gelic_wireless.c Tue May 06 10:28:33 2008 +1000 @@ -2151,7 +2151,7 @@ static void gelic_wl_disconnect_event(st * As it waits with timeout, just leave assoc_done * uncompleted, then it terminates with timeout */ - if (down_trylock(&wl->assoc_stat_lock)) { + if (!down_nowait(&wl->assoc_stat_lock)) { pr_debug("%s: already locked\n", __func__); lock = 0; } else {