瀏覽代碼

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>
Daniel Ritz 17 年之前
父節點
當前提交
2a8281d72d
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      drivers/input/touchscreen/usbtouchscreen.c

+ 2 - 1
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);
 	                      TSC10_RATE_150, 0, buf, 2, USB_CTRL_SET_TIMEOUT);
 	if (ret < 0)
 	if (ret < 0)
 		return ret;
 		return ret;
-	if (buf[0] != 0x06 || buf[1] != 0x00)
+	if ((buf[0] != 0x06 || buf[1] != 0x00) &&
+	    (buf[0] != 0x15 || buf[1] != 0x01))
 		return -ENODEV;
 		return -ENODEV;
 
 
 	/* start sending data */
 	/* start sending data */