git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
salinfo.c
diff --git
a/arch/ia64/kernel/salinfo.c
b/arch/ia64/kernel/salinfo.c
index
7053c55
..
e6676fc
100644
(file)
--- a/
arch/ia64/kernel/salinfo.c
+++ b/
arch/ia64/kernel/salinfo.c
@@
-192,7
+192,7
@@
struct salinfo_platform_oemdata_parms {
static void
salinfo_work_to_do(struct salinfo_data *data)
{
-
down_trylock(&data->mutex
);
+
(void)(down_trylock(&data->mutex) ?: 0
);
up(&data->mutex);
}