X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=net%2Fmac802154%2Fiface.c;h=d8043378e7a067f75cbc31bbbf417dc345585be3;hb=b4ee194441d7e4457c7bac6c2a5da8428974db5a;hp=e3d77b07c0e4a4924be35b803dcaf6981ec5f789;hpb=1bc1754e82f03c2c29b6e39ee02af48fa3bdef23;p=deliverable%2Flinux.git

diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index e3d77b07c0e4..d8043378e7a0 100644
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -302,15 +302,15 @@ static int mac802154_slave_close(struct net_device *dev)
 
 	ASSERT_RTNL();
 
-	hrtimer_cancel(&local->ifs_timer);
-
 	netif_stop_queue(dev);
 	local->open_count--;
 
 	clear_bit(SDATA_STATE_RUNNING, &sdata->state);
 
-	if (!local->open_count)
+	if (!local->open_count) {
+		hrtimer_cancel(&local->ifs_timer);
 		drv_stop(local);
+	}
 
 	return 0;
 }