HID: playstation: DS4: Fix LED blinking

There was no way to disable blinking once enabled.
Disable it on brightness = 0, as per the Linux LED spec.

The driver reports back the values it sends to the controller, but they
need to be scaled back to milliseconds. Setting the LED blinking via
sysfs works as expected now.

Signed-off-by: Max Staudt <max@enpas.org>
Signed-off-by: Jiri Kosina <jkosina@suse.com>

diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c
index 8ac8f7b8e317302c940f2d1a9f9953599a7dfadb..7f50e13601f08f324bb5536ae6e72916182981ad 100644 (file)
--- a/drivers/hid/hid-playstation.c
+++ b/drivers/hid/hid-playstation.c
@@ -2037,8 +2037,9 @@ static int dualshock4_led_set_blink(struct led_classdev *led, unsigned long *del
 
        dualshock4_schedule_work(ds4);
 
-       *delay_on = ds4->lightbar_blink_on;
-       *delay_off = ds4->lightbar_blink_off;
+       /* Report scaled values back to LED subsystem */
+       *delay_on = ds4->lightbar_blink_on * 10;
+       *delay_off = ds4->lightbar_blink_off * 10;
 
        return 0;
 }
@@ -2065,6 +2066,13 @@ static int dualshock4_led_set_brightness(struct led_classdev *led, enum led_brig
                break;
        case 3:
                ds4->lightbar_enabled = !!value;
+
+               /* brightness = 0 also cancels blinking in Linux. */
+               if (!ds4->lightbar_enabled) {
+                       ds4->lightbar_blink_off = 0;
+                       ds4->lightbar_blink_on = 0;
+                       ds4->update_lightbar_blink = true;
+               }
        }
 
        ds4->update_lightbar = true;