Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09d692e6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: appletouch - remove extra KERN_DEBUG use from dprintk
  Input: bu21013_ts - fix null dereference in error handling
  Input: ad7879 - prevent invalid finger data reports
parents ce9d8d9f d745b532

drivers/input/mouse/appletouch.c

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ static void atp_complete_geyser_3_4(struct urb *urb) 
	/* Just update the base values (i.e. touchpad in untouched state) */

	if (dev->data[dev->info->datalen - 1] & ATP_STATUS_BASE_UPDATE) {



		dprintk(KERN_DEBUG "appletouch: updated base values\n");

		dprintk("appletouch: updated base values\n");



		memcpy(dev->xy_old, dev->xy_cur, sizeof(dev->xy_old));

		goto exit;

drivers/input/touchscreen/ad7879.c

+27 −5
Original line number Diff line number Diff line
@@ -129,6 +129,9 @@ struct ad7879 { 
	u16			cmd_crtl1;

	u16			cmd_crtl2;

	u16			cmd_crtl3;

	int			x;

	int			y;

	int			Rt;

};



static int ad7879_read(struct ad7879 *ts, u8 reg)
@@ -175,13 +178,32 @@ static int ad7879_report(struct ad7879 *ts) 
		Rt /= z1;

		Rt = (Rt + 2047) >> 12;



		if (!timer_pending(&ts->timer))

			input_report_key(input_dev, BTN_TOUCH, 1);

		/*

		 * Sample found inconsistent, pressure is beyond

		 * the maximum. Don't report it to user space.

		 */

		if (Rt > ts->pressure_max)

			return -EINVAL;



		input_report_abs(input_dev, ABS_X, x);

		input_report_abs(input_dev, ABS_Y, y);

		input_report_abs(input_dev, ABS_PRESSURE, Rt);

		/*

		 * Note that we delay reporting events by one sample.

		 * This is done to avoid reporting last sample of the

		 * touch sequence, which may be incomplete if finger

		 * leaves the surface before last reading is taken.

		 */

		if (timer_pending(&ts->timer)) {

			/* Touch continues */

			input_report_key(input_dev, BTN_TOUCH, 1);

			input_report_abs(input_dev, ABS_X, ts->x);

			input_report_abs(input_dev, ABS_Y, ts->y);

			input_report_abs(input_dev, ABS_PRESSURE, ts->Rt);

			input_sync(input_dev);

		}



		ts->x = x;

		ts->y = y;

		ts->Rt = Rt;



		return 0;

	}

drivers/input/touchscreen/bu21013_ts.c

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ static int __devinit bu21013_probe(struct i2c_client *client, 
err_cs_disable:

	pdata->cs_dis(pdata->cs_pin);

err_free_mem:

	input_free_device(bu21013_data->in_dev);

	input_free_device(in_dev);

	kfree(bu21013_data);



	return error;