Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2a8281d72da5dd8da025e6822dadd23a35383895
Commit:     2a8281d72da5dd8da025e6822dadd23a35383895
Parent:     f76f672e093b1dc3abff3a21ae6b939b08d192e7
Author:     Daniel Ritz <[EMAIL PROTECTED]>
AuthorDate: Mon Sep 10 01:31:40 2007 -0400
Committer:  Dmitry Torokhov <[EMAIL PROTECTED]>
CommitDate: Mon Sep 10 01:31:40 2007 -0400

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Dmitry Torokhov <[EMAIL PROTECTED]>
---
 drivers/input/touchscreen/usbtouchscreen.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/input/touchscreen/usbtouchscreen.c 
b/drivers/input/touchscreen/usbtouchscreen.c
index 796b837..13fbda0 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 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to