@@ -1316,25 +1316,7 @@ static int elants_i2c_probe(struct i2c_client *client,
1316
1316
ts -> input -> name = "Elan Touchscreen" ;
1317
1317
ts -> input -> id .bustype = BUS_I2C ;
1318
1318
1319
- __set_bit (BTN_TOUCH , ts -> input -> keybit );
1320
- __set_bit (EV_ABS , ts -> input -> evbit );
1321
- __set_bit (EV_KEY , ts -> input -> evbit );
1322
-
1323
- /* Single touch input params setup */
1324
- input_set_abs_params (ts -> input , ABS_X , 0 , ts -> x_max , 0 , 0 );
1325
- input_set_abs_params (ts -> input , ABS_Y , 0 , ts -> y_max , 0 , 0 );
1326
- input_set_abs_params (ts -> input , ABS_PRESSURE , 0 , 255 , 0 , 0 );
1327
- input_abs_set_res (ts -> input , ABS_X , ts -> x_res );
1328
- input_abs_set_res (ts -> input , ABS_Y , ts -> y_res );
1329
-
1330
1319
/* Multitouch input params setup */
1331
- error = input_mt_init_slots (ts -> input , MAX_CONTACT_NUM ,
1332
- INPUT_MT_DIRECT | INPUT_MT_DROP_UNUSED );
1333
- if (error ) {
1334
- dev_err (& client -> dev ,
1335
- "failed to initialize MT slots: %d\n" , error );
1336
- return error ;
1337
- }
1338
1320
1339
1321
input_set_abs_params (ts -> input , ABS_MT_POSITION_X , 0 , ts -> x_max , 0 , 0 );
1340
1322
input_set_abs_params (ts -> input , ABS_MT_POSITION_Y , 0 , ts -> y_max , 0 , 0 );
@@ -1346,6 +1328,14 @@ static int elants_i2c_probe(struct i2c_client *client,
1346
1328
input_abs_set_res (ts -> input , ABS_MT_POSITION_Y , ts -> y_res );
1347
1329
input_abs_set_res (ts -> input , ABS_MT_TOUCH_MAJOR , 1 );
1348
1330
1331
+ error = input_mt_init_slots (ts -> input , MAX_CONTACT_NUM ,
1332
+ INPUT_MT_DIRECT | INPUT_MT_DROP_UNUSED );
1333
+ if (error ) {
1334
+ dev_err (& client -> dev ,
1335
+ "failed to initialize MT slots: %d\n" , error );
1336
+ return error ;
1337
+ }
1338
+
1349
1339
error = input_register_device (ts -> input );
1350
1340
if (error ) {
1351
1341
dev_err (& client -> dev ,
0 commit comments