diff --git a/[refs] b/[refs]
index 542234657d93..7610645b6e9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cad2b31a76763d06048fb23a17b062acd5d46639
+refs/heads/master: 1d1a73ccdc618168f2a5c962aab250605c93e517
diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 4a7d88d28211..899c06fe0bf5 100644
--- a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -3366,6 +3366,7 @@ static void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm)
 {
 	struct timer_list *timer = &(bcm->periodic_tasks);
 
+	assert(bcm->initialized);
 	setup_timer(timer,
 		    bcm43xx_periodic_task_handler,
 		    (unsigned long)bcm);