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

This commit is contained in:
Jiri Kosina 2022-01-10 09:59:32 +01:00
commit cd598d2129
1 changed files with 2 additions and 6 deletions

View File

@ -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;