Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 554215c5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-fixes-for-3.15-20140528' of git://gitorious.org/linux-can/linux-can 



Marc Kleine-Budde says:

====================
pull-request: can 2014-05-28

here's a pull request for v3.15, hope it's not too late.

Oliver Hartkopp fixed a bug in the CAN led trigger device renaming code.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 111c6094 45fb4f8d

drivers/net/can/led.c

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

	if (!priv)

		return NOTIFY_DONE;

		return NOTIFY_DONE;





	if (!priv->tx_led_trig || !priv->rx_led_trig)

		return NOTIFY_DONE;



	if (msg == NETDEV_CHANGENAME) {

	if (msg == NETDEV_CHANGENAME) {

		snprintf(name, sizeof(name), "%s-tx", netdev->name);

		snprintf(name, sizeof(name), "%s-tx", netdev->name);

		led_trigger_rename_static(name, priv->tx_led_trig);

		led_trigger_rename_static(name, priv->tx_led_trig);