diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-07-19 20:22:34 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-07-19 20:26:16 +1000 |
| commit | ccc335068468a4d45f64d91f56f68abe76b0476b (patch) | |
| tree | e33a8f284a813a4b27164372acb0d7dfb7f07d5f | |
| parent | ed3387c4defc0e7a1043b99029f004ce08a53dbb (diff) | |
| download | xf86-input-wacom-ccc335068468a4d45f64d91f56f68abe76b0476b.tar.gz | |
Always reset the fd to -1
If the device is specified in the xorg.conf, the fd is on 0 by default. If
no Option Device is present, pInfo->fd isn't touched but still close(2)'d,
stopping error logging.
This is a RHEL6-commit only, upstream should just fix the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/wcmConfig.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/wcmConfig.c b/src/wcmConfig.c index f8aac5a..f07e0af 100644 --- a/src/wcmConfig.c +++ b/src/wcmConfig.c @@ -57,6 +57,7 @@ static int wcmAllocate(InputInfoPtr pInfo) goto error; pInfo->flags = 0; + pInfo->fd = -1; pInfo->device_control = gWacomModule.DevProc; pInfo->read_input = gWacomModule.DevReadInput; pInfo->control_proc = gWacomModule.DevChangeControl; |