aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r--drivers/input/touchscreen/stmpe-ts.c2
-rw-r--r--drivers/input/touchscreen/sx8654.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/stmpe-ts.c b/drivers/input/touchscreen/stmpe-ts.c
index 2d5ff86b343f..e4c31256a74d 100644
--- a/drivers/input/touchscreen/stmpe-ts.c
+++ b/drivers/input/touchscreen/stmpe-ts.c
@@ -164,7 +164,7 @@ static irqreturn_t stmpe_ts_handler(int irq, void *data)
164 STMPE_TSC_CTRL_TSC_EN, STMPE_TSC_CTRL_TSC_EN); 164 STMPE_TSC_CTRL_TSC_EN, STMPE_TSC_CTRL_TSC_EN);
165 165
166 /* start polling for touch_det to detect release */ 166 /* start polling for touch_det to detect release */
167 schedule_delayed_work(&ts->work, HZ / 50); 167 schedule_delayed_work(&ts->work, msecs_to_jiffies(50));
168 168
169 return IRQ_HANDLED; 169 return IRQ_HANDLED;
170} 170}
diff --git a/drivers/input/touchscreen/sx8654.c b/drivers/input/touchscreen/sx8654.c
index aecb9ad2e701..642f4a53de50 100644
--- a/drivers/input/touchscreen/sx8654.c
+++ b/drivers/input/touchscreen/sx8654.c
@@ -187,7 +187,7 @@ static int sx8654_probe(struct i2c_client *client,
187 return -ENOMEM; 187 return -ENOMEM;
188 188
189 input = devm_input_allocate_device(&client->dev); 189 input = devm_input_allocate_device(&client->dev);
190 if (!sx8654) 190 if (!input)
191 return -ENOMEM; 191 return -ENOMEM;
192 192
193 input->name = "SX8654 I2C Touchscreen"; 193 input->name = "SX8654 I2C Touchscreen";