pull-request: can 2014-05-28

pull-request: can 2014-05-28

[Marc Kleine-Budde]

Hello David,

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.

regards,
Marc

---

The following changes since commit 8646224cdb945eca4293e2131e5be47930ce3e80:

  Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (2014-05-24 14:06:19 -0400)

are available in the git repository at:


  git://gitorious.org/linux-can/linux-can.git tags/linux-can-fixes-for-3.15-20140528

for you to fetch changes up to 45fb4f8d81578e0a17c45c4593a3305afbf7a48b:

  can: only rename enabled led triggers when changing the netdev name (2014-05-27 15:05:41 +0200)

----------------------------------------------------------------
linux-can-fixes-for-3.15-20140528

----------------------------------------------------------------
Oliver Hartkopp (1):
      can: only rename enabled led triggers when changing the netdev name

 drivers/net/can/led.c | 3 +++
 1 file changed, 3 insertions(+)

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

[Marc Kleine-Budde]

From: Oliver Hartkopp <socketcan@hartkopp.net>

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.

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> # >= v3.9
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 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);
-- 
2.0.0.rc2

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

[David Miller]

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Wed, 28 May 2014 10:04:42 +0200

> 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.

Pulled, thanks.