diff options
| author | Jeremy Huddleston <jeremy@yuffie.local> | 2008-01-03 13:26:22 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremy@yuffie.local> | 2008-01-03 13:26:22 -0800 |
| commit | c9dff90ce869131e2d4e020c2f80674ec9ef2ccb (patch) | |
| tree | 3d6e64b6743bfe821092202af78638abdd6579c9 /dix | |
| parent | 8e4c28ec2a72619bd47af4286b9bbf0c019dc6da (diff) | |
| parent | 60144ac814ee26e151186f7c93cb1a273468d497 (diff) | |
Merge branch 'server-1.4-branch' into xorg-server-1.4-apple
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/devices.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dix/devices.c b/dix/devices.c index 287d730a3..f6f3c8ece 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -473,7 +473,8 @@ InitAndStartDevices(void) for (dev = inputInfo.off_devices; dev; dev = dev->next) { DebugF("(dix) initialising device %d\n", dev->id); - ActivateDevice(dev); + if (!dev->inited) + ActivateDevice(dev); } for (dev = inputInfo.off_devices; dev; dev = next) { |