diff --git a/[refs] b/[refs]
index ff25a556bd52..14442cdc5b06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6775cab98b89b2caa10dce4b07e2c81999e45517
+refs/heads/master: 7e5c6bc0a600c49e5922591ad41ff41987f54eb4
diff --git a/trunk/net/irda/irda_device.c b/trunk/net/irda/irda_device.c
index fda299e300c0..9b9bb003c5a9 100644
--- a/trunk/net/irda/irda_device.c
+++ b/trunk/net/irda/irda_device.c
@@ -125,8 +125,15 @@ void irda_device_set_media_busy(struct net_device *dev, int status)
 
 	self = (struct irlap_cb *) dev->atalk_ptr;
 
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == LAP_MAGIC, return;);
+	/* Some drivers may enable the receive interrupt before calling
+	 * irlap_open(), or they may disable the receive interrupt
+	 * after calling irlap_close().
+	 * The IrDA stack is protected from this in irlap_driver_rcv().
+	 * However, the driver calls directly the wrapper, that calls
+	 * us directly. Make sure we protect ourselves.
+	 * Jean II */
+	if (!self || self->magic != LAP_MAGIC)
+		return;
 
 	if (status) {
 		self->media_busy = TRUE;