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

Commit 6101cb7e authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-4.15/logitech' into for-linus 

- small code fixes for Logitech driver from Colin Ian King
parents e1548dcd 6cb6d98a

drivers/hid/hid-lg.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -756,7 +756,9 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id) 




	/* Setup wireless link with Logitech Wii wheel */

	/* Setup wireless link with Logitech Wii wheel */

	if (hdev->product == USB_DEVICE_ID_LOGITECH_WII_WHEEL) {

	if (hdev->product == USB_DEVICE_ID_LOGITECH_WII_WHEEL) {

		const unsigned char cbuf[] = { 0x00, 0xAF,  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };

		static const unsigned char cbuf[] = {

			0x00, 0xAF,  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

		};

		u8 *buf = kmemdup(cbuf, sizeof(cbuf), GFP_KERNEL);

		u8 *buf = kmemdup(cbuf, sizeof(cbuf), GFP_KERNEL);





		if (!buf) {

		if (!buf) {

drivers/hid/hid-lg4ff.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -474,9 +474,7 @@ static int lg4ff_play(struct input_dev *dev, void *data, struct ff_effect *effec 
static void lg4ff_set_autocenter_default(struct input_dev *dev, u16 magnitude)

static void lg4ff_set_autocenter_default(struct input_dev *dev, u16 magnitude)

{

{

	struct hid_device *hid = input_get_drvdata(dev);

	struct hid_device *hid = input_get_drvdata(dev);

	struct list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT].report_list;

	s32 *value;

	struct hid_report *report = list_entry(report_list->next, struct hid_report, list);

	s32 *value = report->field[0]->value;

	u32 expand_a, expand_b;

	u32 expand_a, expand_b;

	struct lg4ff_device_entry *entry;

	struct lg4ff_device_entry *entry;

	struct lg_drv_data *drv_data;

	struct lg_drv_data *drv_data;