Commit 9f8b483c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull HID fixes from Jiri Kosina:

 - fix for ordering of device removal actions in hidraw, by Fernando
   Luis Vázquez Cao

 - fix for uninitialized workqueue usage in hid-sony, by Frank Praznik

 - device ID addition for new variant of Logitech G27, from Simon Wood

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: hid-lg4ff: Support new version of G27
  HID: hidraw: fix warning destroying hidraw device files after parent
  HID: sony: Fix work queue issues.
parents dcb99fd9 6b5625b2

drivers/hid/hid-lg4ff.c

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#define G25_REV_MIN 0x22

#define G27_REV_MAJ 0x12

#define G27_REV_MIN 0x38

#define G27_2_REV_MIN 0x39



#define to_hid_device(pdev) container_of(pdev, struct hid_device, dev)
@@ -130,6 +131,7 @@ static const struct lg4ff_usb_revision lg4ff_revs[] = { 
	{DFP_REV_MAJ,  DFP_REV_MIN,  &native_dfp},	/* Driving Force Pro */

	{G25_REV_MAJ,  G25_REV_MIN,  &native_g25},	/* G25 */

	{G27_REV_MAJ,  G27_REV_MIN,  &native_g27},	/* G27 */

	{G27_REV_MAJ,  G27_2_REV_MIN,  &native_g27},	/* G27 v2 */

};



/* Recalculates X axis value accordingly to currently selected range */

drivers/hid/hid-sony.c

+12 −15
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#define DUALSHOCK4_CONTROLLER_BT  BIT(6)



#define SONY_LED_SUPPORT (SIXAXIS_CONTROLLER_USB | BUZZ_CONTROLLER | DUALSHOCK4_CONTROLLER_USB)

#define SONY_FF_SUPPORT (SIXAXIS_CONTROLLER_USB | DUALSHOCK4_CONTROLLER_USB)



#define MAX_LEDS 4
@@ -499,6 +500,7 @@ struct sony_sc { 
	__u8 right;

#endif



	__u8 worker_initialized;

	__u8 led_state[MAX_LEDS];

	__u8 led_count;

};
@@ -993,22 +995,11 @@ static int sony_init_ff(struct hid_device *hdev) 
	return input_ff_create_memless(input_dev, NULL, sony_play_effect);

}



static void sony_destroy_ff(struct hid_device *hdev)

{

	struct sony_sc *sc = hid_get_drvdata(hdev);



	cancel_work_sync(&sc->state_worker);

}



#else

static int sony_init_ff(struct hid_device *hdev)

{

	return 0;

}



static void sony_destroy_ff(struct hid_device *hdev)

{

}

#endif



static int sony_set_output_report(struct sony_sc *sc, int req_id, int req_size)
@@ -1077,6 +1068,8 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	if (sc->quirks & SIXAXIS_CONTROLLER_USB) {

		hdev->hid_output_raw_report = sixaxis_usb_output_raw_report;

		ret = sixaxis_set_operational_usb(hdev);



		sc->worker_initialized = 1;

		INIT_WORK(&sc->state_worker, sixaxis_state_worker);

	}

	else if (sc->quirks & SIXAXIS_CONTROLLER_BT)
@@ -1087,6 +1080,7 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id) 
		if (ret < 0)

			goto err_stop;



		sc->worker_initialized = 1;

		INIT_WORK(&sc->state_worker, dualshock4_state_worker);

	} else {

		ret = 0;
@@ -1101,9 +1095,11 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id) 
			goto err_stop;

	}



	if (sc->quirks & SONY_FF_SUPPORT) {

		ret = sony_init_ff(hdev);

		if (ret < 0)

			goto err_stop;

	}



	return 0;

err_stop:
@@ -1120,7 +1116,8 @@ static void sony_remove(struct hid_device *hdev) 
	if (sc->quirks & SONY_LED_SUPPORT)

		sony_leds_remove(hdev);



	sony_destroy_ff(hdev);

	if (sc->worker_initialized)

		cancel_work_sync(&sc->state_worker);



	hid_hw_stop(hdev);

}

drivers/hid/hidraw.c

+2 −2
Original line number Diff line number Diff line
@@ -320,13 +320,13 @@ static void drop_ref(struct hidraw *hidraw, int exists_bit) 
			hid_hw_close(hidraw->hid);

			wake_up_interruptible(&hidraw->wait);

		}

		device_destroy(hidraw_class,

			       MKDEV(hidraw_major, hidraw->minor));

	} else {

		--hidraw->open;

	}

	if (!hidraw->open) {

		if (!hidraw->exist) {

			device_destroy(hidraw_class,

					MKDEV(hidraw_major, hidraw->minor));

			hidraw_table[hidraw->minor] = NULL;

			kfree(hidraw);

		} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE