All of lore.kernel.org
 help / color / mirror / Atom feed
From: Oliver Hartkopp <socketcan@hartkopp.net>
To: linux-can@vger.kernel.org
Cc: dev.kurt@vandijck-laurijssen.be, fabio.baltieri@gmail.com,
	Oliver Hartkopp <socketcan@hartkopp.net>
Subject: [PATCH] can: only rename enabled led triggers when changing the netdev name
Date: Tue, 27 May 2014 13:30:56 +0200	[thread overview]
Message-ID: <1401190256-2963-1-git-send-email-socketcan@hartkopp.net> (raw)

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: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
CC: Fabio Baltieri <fabio.baltieri@gmail.com>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
---
 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.rc4


             reply	other threads:[~2014-05-27 11:31 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-27 11:30 Oliver Hartkopp [this message]
2014-05-27 13:00 ` [PATCH] can: only rename enabled led triggers when changing the netdev name Kurt Van Dijck
2014-05-28  8:06 ` Marc Kleine-Budde
  -- strict thread matches above, loose matches on Subject: below --
2014-05-28  8:04 pull-request: can 2014-05-28 Marc Kleine-Budde
2014-05-28  8:04 ` [PATCH] can: only rename enabled led triggers when changing the netdev name Marc Kleine-Budde

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1401190256-2963-1-git-send-email-socketcan@hartkopp.net \
    --to=socketcan@hartkopp.net \
    --cc=dev.kurt@vandijck-laurijssen.be \
    --cc=fabio.baltieri@gmail.com \
    --cc=linux-can@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.