summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-06-27 03:37:01 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-06-27 03:50:11 +1000
commitb48e5e47ba5c952c8a7a6aeb08d875be8682fe32 (patch)
tree1fa2fdaff10b744364eebdd51c930f6dd09052a7
parentd494cb0107dfb618e5fda70994bbec7d0855b231 (diff)
Only free the device->common if we actually have a device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/xf86Aiptek.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
index 8421a70..3a60d13 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -1781,12 +1781,15 @@ xf86AiptekUninit(InputDriverPtr drv,
DBG(1, "xf86AiptekUninit\n");
- if (device->common && device->common->xCapacity != -10101)
+ if (device)
{
- device->common->xCapacity = -10101;
- free(device->common);
+ if (device->common && device->common->xCapacity != -10101)
+ {
+ device->common->xCapacity = -10101;
+ free(device->common);
+ }
+ free (device);
}
- free (device);
pInfo->private = NULL;
xf86DeleteInput(pInfo, 0);
}