Commit 25221c99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull HID fixes from Jiri Kosina:

 - NULL pointer dereference regression fix for Wacom driver (Jason
   Gerecke)

 - functional regression fix for pam handling on some Elan and Synaptics
   touchpads (Kai-Heng Feng)

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: wacom: Correct NULL dereference on AES pen proximity
  HID: multitouch: Apply MT_QUIRK_CONFIDENCE quirk for multi-input devices
parents fc856f1d 179e8e47

drivers/hid/hid-multitouch.c

+2 −1
Original line number Diff line number Diff line
@@ -758,7 +758,8 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
			MT_STORE_FIELD(inrange_state);

			return 1;

		case HID_DG_CONFIDENCE:

			if (cls->name == MT_CLS_WIN_8 &&

			if ((cls->name == MT_CLS_WIN_8 ||

			     cls->name == MT_CLS_WIN_8_FORCE_MULTI_INPUT) &&

				(field->application == HID_DG_TOUCHPAD ||

				 field->application == HID_DG_TOUCHSCREEN))

				app->quirks |= MT_QUIRK_CONFIDENCE;

drivers/hid/wacom_sys.c

+4 −3
Original line number Diff line number Diff line
@@ -147,9 +147,9 @@ static int wacom_wac_pen_serial_enforce(struct hid_device *hdev, 
	}



	if (flush)

		wacom_wac_queue_flush(hdev, &wacom_wac->pen_fifo);

		wacom_wac_queue_flush(hdev, wacom_wac->pen_fifo);

	else if (insert)

		wacom_wac_queue_insert(hdev, &wacom_wac->pen_fifo,

		wacom_wac_queue_insert(hdev, wacom_wac->pen_fifo,

				       raw_data, report_size);



	return insert && !flush;
@@ -1280,7 +1280,7 @@ static void wacom_devm_kfifo_release(struct device *dev, void *res) 
static int wacom_devm_kfifo_alloc(struct wacom *wacom)

{

	struct wacom_wac *wacom_wac = &wacom->wacom_wac;

	struct kfifo_rec_ptr_2 *pen_fifo = &wacom_wac->pen_fifo;

	struct kfifo_rec_ptr_2 *pen_fifo;

	int error;



	pen_fifo = devres_alloc(wacom_devm_kfifo_release,
@@ -1297,6 +1297,7 @@ static int wacom_devm_kfifo_alloc(struct wacom *wacom) 
	}



	devres_add(&wacom->hdev->dev, pen_fifo);

	wacom_wac->pen_fifo = pen_fifo;



	return 0;

}

drivers/hid/wacom_wac.h

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ struct wacom_wac { 
	struct input_dev *pen_input;

	struct input_dev *touch_input;

	struct input_dev *pad_input;

	struct kfifo_rec_ptr_2 pen_fifo;

	struct kfifo_rec_ptr_2 *pen_fifo;

	int pid;

	int num_contacts_left;

	u8 bt_features;