Skip to content

Commit 114a55c

Browse files
mungewellJiri Kosina
authored andcommitted
HID:hid-lg4ff: Initialize device properties before we touch autocentering.
Re-arrange code slightly to ensure that device properties are configured before calling auto-center command. Reported-by: Michal Malý <[email protected]> Signed-off-by: Simon Wood <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent 56930e7 commit 114a55c

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

drivers/hid/hid-lg4ff.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -589,17 +589,6 @@ int lg4ff_init(struct hid_device *hid)
589589
if (error)
590590
return error;
591591

592-
/* Check if autocentering is available and
593-
* set the centering force to zero by default */
594-
if (test_bit(FF_AUTOCENTER, dev->ffbit)) {
595-
if (rev_maj == FFEX_REV_MAJ && rev_min == FFEX_REV_MIN) /* Formula Force EX expects different autocentering command */
596-
dev->ff->set_autocenter = hid_lg4ff_set_autocenter_ffex;
597-
else
598-
dev->ff->set_autocenter = hid_lg4ff_set_autocenter_default;
599-
600-
dev->ff->set_autocenter(dev, 0);
601-
}
602-
603592
/* Get private driver data */
604593
drv_data = hid_get_drvdata(hid);
605594
if (!drv_data) {
@@ -620,6 +609,17 @@ int lg4ff_init(struct hid_device *hid)
620609
entry->max_range = lg4ff_devices[i].max_range;
621610
entry->set_range = lg4ff_devices[i].set_range;
622611

612+
/* Check if autocentering is available and
613+
* set the centering force to zero by default */
614+
if (test_bit(FF_AUTOCENTER, dev->ffbit)) {
615+
if (rev_maj == FFEX_REV_MAJ && rev_min == FFEX_REV_MIN) /* Formula Force EX expects different autocentering command */
616+
dev->ff->set_autocenter = hid_lg4ff_set_autocenter_ffex;
617+
else
618+
dev->ff->set_autocenter = hid_lg4ff_set_autocenter_default;
619+
620+
dev->ff->set_autocenter(dev, 0);
621+
}
622+
623623
/* Create sysfs interface */
624624
error = device_create_file(&hid->dev, &dev_attr_range);
625625
if (error)

0 commit comments

Comments
 (0)