summaryrefslogtreecommitdiffstats
path: root/arch/arc/include/asm/checksum.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-08-30 14:57:03 +0200
committerTakashi Iwai <tiwai@suse.de>2021-08-30 14:57:03 +0200
commita8729efbbb847f6ea9b06e73491ec8ddb560465e (patch)
treec2e172452158457ab238080405060110934ad9d1 /arch/arc/include/asm/checksum.h
parentf7b82b12626e10a2f5332b699cc79819ac8decc7 (diff)
parent38b7673000949ca784fcb8a9feb70d2a802befa6 (diff)
downloadlinux-a8729efbbb847f6ea9b06e73491ec8ddb560465e.tar.bz2
Merge tag 'asoc-v5.15' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v5.15 Quite a quiet release this time, mostly a combination of cleanups and a good set of new drivers. - Lots of cleanups and improvements to the Intel drivers, including some new systems support. - New support for AMD Vangoh, CUI CMM-4030D-261, Mediatek Mt8195, Renesas RZ/G2L Mediatek Mt8195, RealTek RT101P, Renesas RZ/G2L,, Rockchip RK3568 S/PDIF.
Diffstat (limited to 'arch/arc/include/asm/checksum.h')
-rw-r--r--arch/arc/include/asm/checksum.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/include/asm/checksum.h b/arch/arc/include/asm/checksum.h
index 69debd77cd04..0b485800a392 100644
--- a/arch/arc/include/asm/checksum.h
+++ b/arch/arc/include/asm/checksum.h
@@ -24,7 +24,7 @@
*/
static inline __sum16 csum_fold(__wsum s)
{
- unsigned r = s << 16 | s >> 16; /* ror */
+ unsigned int r = s << 16 | s >> 16; /* ror */
s = ~s;
s -= r;
return s >> 16;