Module Name: src
Committed By: thorpej
Date: Tue Jun 4 03:03:34 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sunxi_ts.c
Log Message:
Only call wsmouse_input() if we have a wsmousedev attached (which only
happens if the DT tells us to connect one).
Fixes a panic on my Lamobo R1 (with no connected touchscreen).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/sunxi/sunxi_ts.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/arch/arm/sunxi/sunxi_ts.c
diff -u src/sys/arch/arm/sunxi/sunxi_ts.c:1.2 src/sys/arch/arm/sunxi/sunxi_ts.c:1.3
--- src/sys/arch/arm/sunxi/sunxi_ts.c:1.2 Mon Oct 9 14:28:01 2017
+++ src/sys/arch/arm/sunxi/sunxi_ts.c Tue Jun 4 03:03:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_ts.c,v 1.2 2017/10/09 14:28:01 jmcneill Exp $ */
+/* $NetBSD: sunxi_ts.c,v 1.3 2019/06/04 03:03:34 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_ts.c,v 1.2 2017/10/09 14:28:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_ts.c,v 1.3 2019/06/04 03:03:34 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -268,7 +268,7 @@ sunxi_ts_intr(void *priv)
if (sc->sc_ignoredata) {
/* Discard the first report */
sc->sc_ignoredata = false;
- } else {
+ } else if (sc->sc_wsmousedev != NULL) {
if (sc->sc_ts_inverted_x)
x = __SHIFTOUT_MASK(TP_DATA_MASK) - x;
if (sc->sc_ts_inverted_y)
