Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / input / ts / ts-auto.c

diff --git a/drivers/input/ts/ts-auto.c b/drivers/input/ts/ts-auto.c
index 2751d6de3f2e763e0955bd8e42be4ba9dedd7669..af98f482d9cfbacfdcebfb0aa6ce50fce20b643f 100755 (executable)
--- a/drivers/input/ts/ts-auto.c
+++ b/drivers/input/ts/ts-auto.c
@@ -80,7 +80,7 @@ EXPORT_SYMBOL_GPL(ts_reg_read);
  * @buf: Buffer to fill.\r
  */\r
 int ts_bulk_read(struct ts_private_data *ts, unsigned short reg,\r
-                    int count, u16 *buf)\r
+                    int count, unsigned char *buf)\r
 {\r
        int ret;\r
 \r
@@ -119,7 +119,7 @@ EXPORT_SYMBOL_GPL(ts_reg_write);
 \r
 \r
 int ts_bulk_write(struct ts_private_data *ts, unsigned short reg,\r
-                    int count, u16 *buf)\r
+                    int count, unsigned char *buf)\r
 {\r
        int ret;\r
 \r
@@ -134,6 +134,7 @@ int ts_bulk_write(struct ts_private_data *ts, unsigned short reg,
 EXPORT_SYMBOL_GPL(ts_bulk_write);\r
 \r
 \r
+\r
 /**\r
  * ts_set_bits: Set the value of a bitfield in a ts register\r
  *\r
@@ -404,11 +405,11 @@ static int ts_irq_init(struct ts_private_data *ts)
                if(ts->ops->poll_delay_ms < 0)\r
                        ts->ops->poll_delay_ms = 30;\r
                \r
-               result = gpio_request(ts->irq, ts->i2c_id->name);\r
-               if (result)\r
-               {\r
-                       printk("%s:fail to request gpio :%d\n",__func__,ts->irq);\r
-               }\r
+               //result = gpio_request(ts->irq, ts->i2c_id->name);\r
+               //if (result)\r
+               //{\r
+               //      printk("%s:fail to request gpio :%d\n",__func__,ts->irq);\r
+               //}\r
        \r
                gpio_pull_updown(ts->irq, PullEnable);\r
                irq = gpio_to_irq(ts->irq);\r