summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-07-19 10:16:52 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-07-19 10:16:52 +1000
commitdd4749fe10cbb2c6ead5a13081b00d4599df86d2 (patch)
tree8d8e66efaf27b81b6a662c2030864d072add9b4e
parent725668c2a1bbf81ae15398683b1623e38213ebe0 (diff)
If xf86AiptekHIDOpen failed in PreInit, assume failure
Invalid device files should fail the driver's init. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/xf86Aiptek.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
index 38e7d81..5f03173 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -1916,7 +1916,8 @@ xf86AiptekInit(InputDriverPtr drv,
*/
if ( shared == 0)
{
- xf86AiptekHIDOpen(pInfo);
+ if (xf86AiptekHIDOpen(pInfo) != Success)
+ goto SetupProc_fail;
close(pInfo->fd);
pInfo->fd=-1;
}