diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2014-05-27 11:30:56 (GMT) |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2014-05-27 13:05:41 (GMT) |
| commit | 45fb4f8d81578e0a17c45c4593a3305afbf7a48b (patch) | |
| tree | 9e2fcd359d83a23613b55585e909e4f66f473dca /drivers | |
| parent | 8646224cdb945eca4293e2131e5be47930ce3e80 (diff) | |
| download | linux-45fb4f8d81578e0a17c45c4593a3305afbf7a48b.tar.xz | |
can: only rename enabled led triggers when changing the netdev name
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 <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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/can/led.c | 3 |
1 files changed, 3 insertions, 0 deletions
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); |