Commit cd598d21 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-5.17/thrustmaster' into for-linus

parents f7716563 415e701c

drivers/hid/hid-tmff.c

+2 −6
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ static int tmff_play(struct input_dev *dev, void *data, 
	struct hid_field *ff_field = tmff->ff_field;

	int x, y;

	int left, right;	/* Rumbling */

	int motor_swap;



	switch (effect->type) {

	case FF_CONSTANT:
@@ -104,11 +103,8 @@ static int tmff_play(struct input_dev *dev, void *data, 
					ff_field->logical_maximum);



		/* 2-in-1 strong motor is left */

		if (hid->product == THRUSTMASTER_DEVICE_ID_2_IN_1_DT) {

			motor_swap = left;

			left = right;

			right = motor_swap;

		}

		if (hid->product == THRUSTMASTER_DEVICE_ID_2_IN_1_DT)

			swap(left, right);



		dbg_hid("(left,right)=(%08x, %08x)\n", left, right);

		ff_field->value[0] = left;