Commit 45fb4f8d authored May 27, 2014 by Oliver Hartkopp Committed by Marc Kleine-Budde May 27, 2014

can: only rename enabled led triggers when changing the netdev name



Commit a1ef7bd9 ("can: rename LED trigger name on netdev renames") renames
the led trigger names according to the changed netdevice name.

As not every CAN driver supports and initializes the led triggers, checking for
the CAN private datastructure with safe_candev_priv() in the notifier chain is
not enough.

This patch adds a check when CONFIG_CAN_LEDS is enabled and the driver does not
support led triggers.

For stable 3.9+

Cc: Fabio Baltieri <fabio.baltieri@gmail.com>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Acked-by: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

parent 8646224c

drivers/net/can/led.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,9 @@ static int can_led_notifier(struct notifier_block *nb, unsigned long msg,
		if (!priv)
		return NOTIFY_DONE;

		if (!priv->tx_led_trig \|\| !priv->rx_led_trig)
		return NOTIFY_DONE;

		if (msg == NETDEV_CHANGENAME) {
		snprintf(name, sizeof(name), "%s-tx", netdev->name);
		led_trigger_rename_static(name, priv->tx_led_trig);

Admin message