linux-can-fixes-for-3.15-20140528
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAlOFkZ4ACgkQjTAFq1RaXHOYCQCeJwwa8XQMw2HkGemGMBSpcUHb MLwAoISCoqgrXWq/lBBzDqlVXik8fR4t =gHVg -----END PGP SIGNATURE----- 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: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
554215c5ca
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue