[PATCH synaptics 2/2] eventcomm: proto_data is not null, don't check

Peter Hutterer peter.hutterer at who-t.net
Mon Jun 25 20:43:45 PDT 2012


We allocate it just a few lines north of here, and already dereferenced it.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/eventcomm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/eventcomm.c b/src/eventcomm.c
index 84f929f..172a59e 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -872,7 +872,7 @@ EventReadDevDimensions(InputInfoPtr pInfo)
         proto_data->axis_map[i] = -1;
     proto_data->cur_slot = -1;
 
-    if (event_query_is_touchpad(pInfo->fd, (proto_data) ? proto_data->need_grab : TRUE)) {
+    if (event_query_is_touchpad(pInfo->fd, proto_data->need_grab)) {
         event_query_touch(pInfo);
         event_query_axis_ranges(pInfo);
     }
-- 
1.7.10.2



More information about the xorg-devel mailing list