Module Name: src
Committed By: kamil
Date: Thu Dec 19 16:25:13 UTC 2019
Modified Files:
src/sys/dev/ic: rtsx.c
Log Message:
Avoid changing signedness bit with << in rtsx_read_cfg()
Reported by <prlw1>
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/rtsx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/rtsx.c
diff -u src/sys/dev/ic/rtsx.c:1.3 src/sys/dev/ic/rtsx.c:1.4
--- src/sys/dev/ic/rtsx.c:1.3 Tue Apr 24 18:34:30 2018
+++ src/sys/dev/ic/rtsx.c Thu Dec 19 16:25:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsx.c,v 1.3 2018/04/24 18:34:30 maya Exp $ */
+/* $NetBSD: rtsx.c,v 1.4 2019/12/19 16:25:13 kamil Exp $ */
/* $OpenBSD: rtsx.c,v 1.10 2014/08/19 17:55:03 phessler Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsx.c,v 1.3 2018/04/24 18:34:30 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsx.c,v 1.4 2019/12/19 16:25:13 kamil Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -1044,7 +1044,7 @@ rtsx_read_cfg(struct rtsx_softc *sc, uin
RTSX_READ(sc, RTSX_CFGDATA1, &data1);
RTSX_READ(sc, RTSX_CFGDATA2, &data2);
RTSX_READ(sc, RTSX_CFGDATA3, &data3);
- *val = (data3 << 24) | (data2 << 16) | (data1 << 8) | data0;
+ *val = ((uint32_t)data3 << 24) | (data2 << 16) | (data1 << 8) | data0;
return 0;
}
