Skip to content

Commit 0316cc5

Browse files
Ansueldavem330
authored andcommitted
leds: trigger: netdev: init mode if hw control already active
On netdev trigger activation, hw control may be already active by default. If this is the case and a device is actually provided by hw_control_get_device(), init the already active mode and set the bool to hw_control bool to true to reflect the already set mode in the trigger_data. Co-developed-by: Andrew Lunn <[email protected]> Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Christian Marangi <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 33ec0b5 commit 0316cc5

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

drivers/leds/trigger/ledtrig-netdev.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,8 @@ static void netdev_trig_work(struct work_struct *work)
454454
static int netdev_trig_activate(struct led_classdev *led_cdev)
455455
{
456456
struct led_netdev_data *trigger_data;
457+
unsigned long mode;
458+
struct device *dev;
457459
int rc;
458460

459461
trigger_data = kzalloc(sizeof(struct led_netdev_data), GFP_KERNEL);
@@ -475,6 +477,21 @@ static int netdev_trig_activate(struct led_classdev *led_cdev)
475477
atomic_set(&trigger_data->interval, msecs_to_jiffies(NETDEV_LED_DEFAULT_INTERVAL));
476478
trigger_data->last_activity = 0;
477479

480+
/* Check if hw control is active by default on the LED.
481+
* Init already enabled mode in hw control.
482+
*/
483+
if (supports_hw_control(led_cdev) &&
484+
!led_cdev->hw_control_get(led_cdev, &mode)) {
485+
dev = led_cdev->hw_control_get_device(led_cdev);
486+
if (dev) {
487+
const char *name = dev_name(dev);
488+
489+
set_device_name(trigger_data, name, strlen(name));
490+
trigger_data->hw_control = true;
491+
trigger_data->mode = mode;
492+
}
493+
}
494+
478495
led_set_trigger_data(led_cdev, trigger_data);
479496

480497
rc = register_netdevice_notifier(&trigger_data->notifier);

0 commit comments

Comments
 (0)