3.13.11.4 -stable review patch. If anyone has any objections, please let me know.
------------------ From: Oliver Hartkopp <[email protected]> commit 45fb4f8d81578e0a17c45c4593a3305afbf7a48b upstream. Commit a1ef7bd9fce8 ("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 <[email protected]> Signed-off-by: Oliver Hartkopp <[email protected]> Acked-by: Kurt Van Dijck <[email protected]> Signed-off-by: Marc Kleine-Budde <[email protected]> Signed-off-by: Kamal Mostafa <[email protected]> --- drivers/net/can/led.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/can/led.c b/drivers/net/can/led.c index a3d99a8..ab7f1b0 100644 --- a/drivers/net/can/led.c +++ b/drivers/net/can/led.c @@ -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); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
