summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDaniel Ritz <daniel.ritz-ml@swissonline.ch>2007-09-10 01:31:40 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2007-09-10 01:31:40 -0400
commit2a8281d72da5dd8da025e6822dadd23a35383895 (patch)
treebee3a76f00003d7cdbb659925f06376f5f1c5413 /drivers/input
parentf76f672e093b1dc3abff3a21ae6b939b08d192e7 (diff)
downloadlinux-2a8281d72da5dd8da025e6822dadd23a35383895.tar.gz
linux-2a8281d72da5dd8da025e6822dadd23a35383895.tar.bz2
linux-2a8281d72da5dd8da025e6822dadd23a35383895.zip
Input: usbtouchscreen - support DMC devices with empty EEPROM
A reply of 0x0600 means all OK, 0x1501 means OK, but EEPROM empty. The behavior with an empty EEPROM is the same as without one at all so do not fail loading the driver. Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/usbtouchscreen.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 796b837deeea..13fbda0895b5 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -402,7 +402,8 @@ static int dmc_tsc10_init(struct usbtouch_usb *usbtouch)
TSC10_RATE_150, 0, buf, 2, USB_CTRL_SET_TIMEOUT);
if (ret < 0)
return ret;
- if (buf[0] != 0x06 || buf[1] != 0x00)
+ if ((buf[0] != 0x06 || buf[1] != 0x00) &&
+ (buf[0] != 0x15 || buf[1] != 0x01))
return -ENODEV;
/* start sending data */