Skip to content

Commit c774a9d

Browse files
LawstorantJiri Kosina
authored andcommitted
HID: pidff: Separate check for infinite duration
It will be used in a few more places so this makes sure it will always work the same. Signed-off-by: Tomasz Pakuła <tomasz.pakula.oficjalny@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.com>
1 parent 7fbaa03 commit c774a9d

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

drivers/hid/usbhid/hid-pidff.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,11 @@ static int pidff_is_effect_conditional(struct ff_effect *effect)
242242
effect->type == FF_FRICTION;
243243
}
244244

245+
static int pidff_is_duration_infinite(u16 duration)
246+
{
247+
return duration == FF_INFINITE || duration == PID_INFINITE;
248+
}
249+
245250
/*
246251
* Get PID effect index from FF effect type.
247252
* Return 0 if invalid.
@@ -374,12 +379,8 @@ static void pidff_set_time(struct pidff_usage *usage, u16 time)
374379

375380
static void pidff_set_duration(struct pidff_usage *usage, u16 duration)
376381
{
377-
/* Infinite value conversion from Linux API -> PID */
378-
if (duration == FF_INFINITE)
379-
duration = PID_INFINITE;
380-
381382
/* PID defines INFINITE as the max possible value for duration field */
382-
if (duration == PID_INFINITE) {
383+
if (pidff_is_duration_infinite(duration)) {
383384
usage->value[0] = (1U << usage->field->report_size) - 1;
384385
return;
385386
}

0 commit comments

Comments
 (0)