summaryrefslogtreecommitdiff
path: root/dix/devices.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-03-09 14:25:54 -0800
committerKeith Packard <keithp@keithp.com>2011-03-09 14:25:54 -0800
commitc3c0e2fdd326214e271ce144e8fc2725cbd738ef (patch)
treec7ee795c9252e1c13ae86848d109773d15b82d9e /dix/devices.c
parenta19771e4337d1c4600550314bbc42a1495a023ff (diff)
parent73555555a440855f9ae64c3367c5c7dca98c8741 (diff)
Merge remote branch 'whot/for-keith'
Diffstat (limited to 'dix/devices.c')
-rw-r--r--dix/devices.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/dix/devices.c b/dix/devices.c
index e57c27b00..636b1b661 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -938,6 +938,8 @@ CloseDevice(DeviceIntPtr dev)
}
free(dev->deviceGrab.sync.event);
+ free(dev->config_info); /* Allocated in xf86ActivateDevice. */
+ dev->config_info = NULL;
dixFreeObjectWithPrivates(dev, PRIVATE_DEVICE);
}