HID: hid-sony: report actual brightness value when reading LED

The Dualshock4 controller contains a RGB LED, which is enabled via
the '/sys/class/leds' interface. At present the driver only returns
whether each of the RGB LEDs is lit (ie not off), but no indication
of it's brightness.

This patch fixes the reading of the current brightnes so that it
returns the value (rather than just off=0, on=LED_FULL).

Tested on the DS4 and SixAxis (for compatibility).

Signed-off-by: Simon Wood <simon@mungewell.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 2bd3f130be20a9e8fc27aff58ebf1992bc083d8e..be0d3861159806a88a2e10a538f2ef112c80fb84 100644 (file)
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -894,7 +894,6 @@ static enum led_brightness sony_led_get_brightness(struct led_classdev *led)
        struct sony_sc *drv_data;
 
        int n;
-       int on = 0;
 
        drv_data = hid_get_drvdata(hdev);
        if (!drv_data) {
@@ -903,13 +902,11 @@ static enum led_brightness sony_led_get_brightness(struct led_classdev *led)
        }
 
        for (n = 0; n < drv_data->led_count; n++) {
-               if (led == drv_data->leds[n]) {
-                       on = !!(drv_data->led_state[n]);
-                       break;
-               }
+               if (led == drv_data->leds[n])
+                       return drv_data->led_state[n];
        }
 
-       return on ? LED_FULL : LED_OFF;
+       return LED_OFF;
 }
 
 static void sony_leds_remove(struct hid_device *hdev)