diff options
| author | Henrik Rydberg <rydberg@euromail.se> | 2008-11-08 15:10:49 +0100 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2008-11-08 15:10:49 +0100 |
| commit | 9f6a75a35de8d05a8ae2e8b5d5cd10d960d4de4b (patch) | |
| tree | eb1c22c2dc172a765d197acf5f1ec55db0031011 /src/mtouch.c | |
| parent | ad124aac8feeaaa1f131ff35d895e777f4ffdc61 (diff) | |
| download | xorg-input-kobomultitouch-9f6a75a35de8d05a8ae2e8b5d5cd10d960d4de4b.tar.gz xorg-input-kobomultitouch-9f6a75a35de8d05a8ae2e8b5d5cd10d960d4de4b.tar.bz2 xorg-input-kobomultitouch-9f6a75a35de8d05a8ae2e8b5d5cd10d960d4de4b.zip | |
cleanup
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to 'src/mtouch.c')
| -rw-r--r-- | src/mtouch.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/mtouch.c b/src/mtouch.c index cb1c44c..6952611 100644 --- a/src/mtouch.c +++ b/src/mtouch.c @@ -20,28 +20,17 @@ int open_mtouch(struct MTouch *mt, int fd) init_hwdata(&mt->hw); init_state(&mt->os); init_state(&mt->ns); - if (mt->grabbed) - return 0; SYSCALL(rc = ioctl(fd, EVIOCGRAB, (pointer)1)); - if (rc < 0) { - xf86Msg(X_WARNING, "multitouch: cannot grab device\n"); - return rc; - } - mt->grabbed = 1; - return 0; + return rc; } /******************************************************/ -void close_mtouch(struct MTouch *mt, int fd) +int close_mtouch(struct MTouch *mt, int fd) { int rc; - if (!mt->grabbed) - return; SYSCALL(rc = ioctl(fd, EVIOCGRAB, (pointer)0)); - if (rc < 0) - xf86Msg(X_WARNING, "multitouch: cannot ungrab device\n"); - mt->grabbed = 0; + return rc; } /******************************************************/ |