diff options
| author | Rasmus Villemoes <rasmus.villemoes@prevas.dk> | 2019-06-24 08:34:13 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-29 08:30:04 +0200 |
| commit | eae5534465c8d831e0c818206e7121286c0efa2d (patch) | |
| tree | 8669b6eddd6760d89072bbe466877e40b2d6ca8c | |
| parent | 7dae14d19c4f9ca518c52ef4a14532c902ed60ca (diff) | |
| download | linux-stable-eae5534465c8d831e0c818206e7121286c0efa2d.tar.gz linux-stable-eae5534465c8d831e0c818206e7121286c0efa2d.tar.bz2 linux-stable-eae5534465c8d831e0c818206e7121286c0efa2d.zip | |
can: dev: call netif_carrier_off() in register_candev()
[ Upstream commit c63845609c4700488e5eacd6ab4d06d5d420e5ef ]
CONFIG_CAN_LEDS is deprecated. When trying to use the generic netdev
trigger as suggested, there's a small inconsistency with the link
property: The LED is on initially, stays on when the device is brought
up, and then turns off (as expected) when the device is brought down.
Make sure the LED always reflects the state of the CAN device.
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/net/can/dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index b6b93a2d93a5..483d270664cc 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -1249,6 +1249,8 @@ int register_candev(struct net_device *dev) return -EINVAL; dev->rtnl_link_ops = &can_link_ops; + netif_carrier_off(dev); + return register_netdev(dev); } EXPORT_SYMBOL_GPL(register_candev); |