Commit 0316cc56 authored by Christian Marangi's avatar Christian Marangi Committed by David S. Miller
Browse files

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: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarChristian Marangi <ansuelsmth@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 33ec0b53

drivers/leds/trigger/ledtrig-netdev.c

+17 −0
Original line number Diff line number Diff line
@@ -454,6 +454,8 @@ static void netdev_trig_work(struct work_struct *work) 
static int netdev_trig_activate(struct led_classdev *led_cdev)

{

	struct led_netdev_data *trigger_data;

	unsigned long mode;

	struct device *dev;

	int rc;



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

	trigger_data->last_activity = 0;



	/* Check if hw control is active by default on the LED.

	 * Init already enabled mode in hw control.

	 */

	if (supports_hw_control(led_cdev) &&

	    !led_cdev->hw_control_get(led_cdev, &mode)) {

		dev = led_cdev->hw_control_get_device(led_cdev);

		if (dev) {

			const char *name = dev_name(dev);



			set_device_name(trigger_data, name, strlen(name));

			trigger_data->hw_control = true;

			trigger_data->mode = mode;

		}

	}



	led_set_trigger_data(led_cdev, trigger_data);



	rc = register_netdevice_notifier(&trigger_data->notifier);