CRIS: locking: fix the return value of arch_read_trylock()

Wei Yongjun · Jesper Nilsson · commit 00addd1a2de8 · 2012-12-20T12:51:19.000+01:00
arch_write_trylock() should return 'ret' instead of always return 1. dpatch engine is used to auto generate this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
diff --git a/arch/cris/include/arch-v32/arch/spinlock.h b/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)

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ static inline int arch_write_trylock(arch_rwlock_t *rw)`
`118`	`118`	`ret = 1;`
`119`	`119`	`}`
`120`	`120`	`arch_spin_unlock(&rw->slock);`
`121`		`- return 1;`
	`121`	`+ return ret;`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`#define _raw_read_lock_flags(lock, flags) _raw_read_lock(lock)`