aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-01-02 20:38:56 +0000
committerRafał Miłecki <zajec5@gmail.com>2016-01-02 20:38:56 +0000
commitb836a7c29d2717785524f94a7a1df3ae7bed8423 (patch)
tree97cbd8d3cb2b9489c103a602269092f3928e1c63
parent6314c24a04d50167a5f963d43e968625c4e54daa (diff)
downloadupstream-b836a7c29d2717785524f94a7a1df3ae7bed8423.tar.gz
upstream-b836a7c29d2717785524f94a7a1df3ae7bed8423.tar.bz2
upstream-b836a7c29d2717785524f94a7a1df3ae7bed8423.zip
ledtrig-netdev: don't stop timer on events for different interfaces
This fixes regression introduced in my recent ledtrig-netdev commit. Events triggered by different interfaces were stopping timer so it wasn't working for tx/rx mode. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 48072
-rw-r--r--target/linux/generic/files/drivers/leds/ledtrig-netdev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/generic/files/drivers/leds/ledtrig-netdev.c b/target/linux/generic/files/drivers/leds/ledtrig-netdev.c
index 5d0f95499b..cfa4dc0758 100644
--- a/target/linux/generic/files/drivers/leds/ledtrig-netdev.c
+++ b/target/linux/generic/files/drivers/leds/ledtrig-netdev.c
@@ -269,11 +269,12 @@ static int netdev_trig_notify(struct notifier_block *nb,
return NOTIFY_DONE;
spin_lock_bh(&trigger_data->lock);
- del_timer_sync(&trigger_data->timer);
if (strcmp(dev->name, trigger_data->device_name))
goto done;
+ del_timer_sync(&trigger_data->timer);
+
if (evt == NETDEV_REGISTER || evt == NETDEV_CHANGENAME) {
if (trigger_data->net_dev != NULL)
dev_put(trigger_data->net_dev);