1 files changed, 4 insertions, 3 deletions
diff --git a/src/ws.c b/src/ws.c
index f50cbc6..9057d9e 100644
--- a/src/ws.c
+++ b/src/ws.c
@@ -285,7 +285,6 @@ wsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
 				" or \"UD\"\n");
 		}
 	}
-	priv->raw = xf86SetBoolOption(pInfo->options, "Raw", 1);
 	if (wsOpen(pInfo) != Success) {
 		goto fail;
 	}
@@ -293,10 +292,12 @@ wsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
 		wsClose(pInfo);
 		goto fail;
 	}
-	if (priv->type == WSMOUSE_TYPE_TPANEL)
+	if (priv->type == WSMOUSE_TYPE_TPANEL) {
 		pInfo->type_name = XI_TOUCHSCREEN;
-	else {
+		priv->raw = xf86SetBoolOption(pInfo->options, "Raw", 1);
+	} else {
 		pInfo->type_name = XI_MOUSE;
+		priv->raw = xf86SetBoolOption(pInfo->options, "Raw", 0);
 		if (priv->raw) {
 			xf86Msg(X_WARNING, "Device is not a touch panel,"
 			    "ignoring 'Option \"Raw\"'\n");