Merge "ft5x06: Set input property bit to indicate a direct input device" (902583a4) · Commits · e / devices / android_kernel_sony_msm8998

drivers/input/touchscreen/ft5x06_ts.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -200,8 +200,9 @@ static int ft5x06_handle_touchdata(struct ft5x06_ts_data *data)
	pointid = (buf[FT_TOUCH_ID_POS + FT_TOUCH_STEP * i]) >> 4;		pointid = (buf[FT_TOUCH_ID_POS + FT_TOUCH_STEP * i]) >> 4;
	if (pointid >= FT_MAX_ID)		if (pointid >= FT_MAX_ID)
	break;		break;
	else
	event->touch_point++;		event->touch_point++;

	event->x[i] =		event->x[i] =
	(s16) (buf[FT_TOUCH_X_H_POS + FT_TOUCH_STEP * i] & 0x0F) <<		(s16) (buf[FT_TOUCH_X_H_POS + FT_TOUCH_STEP * i] & 0x0F) <<
	8 \| (s16) buf[FT_TOUCH_X_L_POS + FT_TOUCH_STEP * i];		8 \| (s16) buf[FT_TOUCH_X_L_POS + FT_TOUCH_STEP * i];
	@@ -419,10 +420,8 @@ static int ft5x06_ts_probe(struct i2c_client *client,
	}		}

	data = kzalloc(sizeof(struct ft5x06_ts_data), GFP_KERNEL);		data = kzalloc(sizeof(struct ft5x06_ts_data), GFP_KERNEL);
	if (!data) {		if (!data)
	dev_err(&client->dev, "Not enough memory\n");
	return -ENOMEM;		return -ENOMEM;
	}

	input_dev = input_allocate_device();		input_dev = input_allocate_device();
	if (!input_dev) {		if (!input_dev) {
	@@ -445,6 +444,7 @@ static int ft5x06_ts_probe(struct i2c_client *client,
	__set_bit(EV_KEY, input_dev->evbit);		__set_bit(EV_KEY, input_dev->evbit);
	__set_bit(EV_ABS, input_dev->evbit);		__set_bit(EV_ABS, input_dev->evbit);
	__set_bit(BTN_TOUCH, input_dev->keybit);		__set_bit(BTN_TOUCH, input_dev->keybit);
			__set_bit(INPUT_PROP_DIRECT, input_dev->propbit);

	input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0,		input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0,
	pdata->x_max, 0, 0);		pdata->x_max, 0, 0);
	@@ -587,7 +587,7 @@ free_mem:
	return err;		return err;
	}		}

	static int __devexit ft5x06_ts_remove(struct i2c_client *client)		static int ft5x06_ts_remove(struct i2c_client *client)
	{		{
	struct ft5x06_ts_data *data = i2c_get_clientdata(client);		struct ft5x06_ts_data *data = i2c_get_clientdata(client);

include/linux/input/ft5x06_ts.h

+2 −2

File changed.

Contains only whitespace changes.