diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/net/wireless/btlock/btlock.c | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/net/wireless/btlock/btlock.c')
| -rw-r--r-- | drivers/net/wireless/btlock/btlock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/btlock/btlock.c b/drivers/net/wireless/btlock/btlock.c index 051eaac..fa6e706 100644 --- a/drivers/net/wireless/btlock/btlock.c +++ b/drivers/net/wireless/btlock/btlock.c @@ -74,8 +74,8 @@ PR("release, cookie_mismatch:%s, owner:%s\n", cookie_msg, owner_cookie == 0 ? "NULL" : owner_msg); } else if (lock_para.lock == 1) { #if 1 - if (down_interruptible(&lock)) { - PR("interrupted\n"); + if (down_killable(&lock)) { + PR("killed\n"); return -ERESTARTSYS; } #else |