Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
input
/
touchscreen
/
tsc200x-core.c
diff --git
a/kernel/drivers/input/touchscreen/tsc200x-core.c
b/kernel/drivers/input/touchscreen/tsc200x-core.c
index
15240c1
..
dfa7f1c
100644
(file)
--- a/
kernel/drivers/input/touchscreen/tsc200x-core.c
+++ b/
kernel/drivers/input/touchscreen/tsc200x-core.c
@@
-450,7
+450,7
@@
static void tsc200x_close(struct input_dev *input)
mutex_unlock(&ts->mutex);
}
mutex_unlock(&ts->mutex);
}
-int tsc200x_probe(struct device *dev, int irq,
__u16 bustype
,
+int tsc200x_probe(struct device *dev, int irq,
const struct input_id *tsc_id
,
struct regmap *regmap,
int (*tsc200x_cmd)(struct device *dev, u8 cmd))
{
struct regmap *regmap,
int (*tsc200x_cmd)(struct device *dev, u8 cmd))
{
@@
-547,9
+547,18
@@
int tsc200x_probe(struct device *dev, int irq, __u16 bustype,
snprintf(ts->phys, sizeof(ts->phys),
"%s/input-ts", dev_name(dev));
snprintf(ts->phys, sizeof(ts->phys),
"%s/input-ts", dev_name(dev));
- input_dev->name = "TSC200X touchscreen";
+ if (tsc_id->product == 2004) {
+ input_dev->name = "TSC200X touchscreen";
+ } else {
+ input_dev->name = devm_kasprintf(dev, GFP_KERNEL,
+ "TSC%04d touchscreen",
+ tsc_id->product);
+ if (!input_dev->name)
+ return -ENOMEM;
+ }
+
input_dev->phys = ts->phys;
input_dev->phys = ts->phys;
- input_dev->id
.bustype = bustype
;
+ input_dev->id
= *tsc_id
;
input_dev->dev.parent = dev;
input_dev->evbit[0] = BIT(EV_ABS) | BIT(EV_KEY);
input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
input_dev->dev.parent = dev;
input_dev->evbit[0] = BIT(EV_ABS) | BIT(EV_KEY);
input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);