git://git.onelab.eu / linux-2.6.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git] / arch / arm / lib / csumpartialcopygeneric.S
diff --git a/arch/arm/lib/csumpartialcopygeneric.S b/arch/arm/lib/csumpartialcopygeneric.S
index d3a2f46..b18b897 100644 (file)
--- a/arch/arm/lib/csumpartialcopygeneric.S
+++ b/arch/arm/lib/csumpartialcopygeneric.S
@@ -160,7 +160,8 @@ FN_ENTRY
 .done:         adc     r0, sum, #0
                ldr     sum, [sp, #0]           @ dst
                tst     sum, #1
-               movne   r0, r0, ror #8
+               movne   sum, r0, lsl #8
+               orrne   r0, sum, r0, lsr #24
                load_regs       ea
 
 .src_not_aligned:
linux-2.6