aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-04 08:04:10 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-04 08:04:10 +0900
commit39b4a46f19295b4876fba6655f27d67232dc6a1f (patch)
treed30a6312bf61fa987774707331c2434d9ebd0198
parentcb37bbd90a11003993d47c395837e0f87abf1b31 (diff)
parent5ff6197f828d5ea051b3abf77cb61f8a34480e8d (diff)
downloadlinux-stericsson-39b4a46f19295b4876fba6655f27d67232dc6a1f.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: Blackfin: strncpy: fix handling of zero lengths
-rw-r--r--arch/blackfin/lib/strncpy.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/lib/strncpy.S b/arch/blackfin/lib/strncpy.S
index f3931d50b4a7..2c07dddac995 100644
--- a/arch/blackfin/lib/strncpy.S
+++ b/arch/blackfin/lib/strncpy.S
@@ -25,7 +25,7 @@
ENTRY(_strncpy)
CC = R2 == 0;
- if CC JUMP 4f;
+ if CC JUMP 6f;
P2 = R2 ; /* size */
P0 = R0 ; /* dst*/