From 59af905ae559c24072da0dae7d4300f87b9cba3a Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Wed, 17 Oct 2012 16:54:27 +0200
Subject: [PATCH] --- yaml --- r: 347413 b: refs/heads/master c:
 00addd1a2de8d83dc3a5d6bb926911268ec716c9 h: refs/heads/master i:   347411:
 6a1b39e587eb7bd9dace83839796fa5d0a802d80 v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/cris/include/arch-v32/arch/spinlock.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f66bb50cbd4e..5746ca4a5bf9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e61ac0b05c53f5b56f3ea623c215437c09d8265b
+refs/heads/master: 00addd1a2de8d83dc3a5d6bb926911268ec716c9
diff --git a/trunk/arch/cris/include/arch-v32/arch/spinlock.h b/trunk/arch/cris/include/arch-v32/arch/spinlock.h
index f171a6600fbc..f13275522f4d 100644
--- a/trunk/arch/cris/include/arch-v32/arch/spinlock.h
+++ b/trunk/arch/cris/include/arch-v32/arch/spinlock.h
@@ -118,7 +118,7 @@ static  inline int arch_write_trylock(arch_rwlock_t *rw)
 		ret = 1;
 	}
 	arch_spin_unlock(&rw->slock);
-	return 1;
+	return ret;
 }
 
 #define _raw_read_lock_flags(lock, flags) _raw_read_lock(lock)