[patch 023/198] irda_device() oops fix

[patch 023/198] irda_device() oops fix

[akpm]

From: Jean Tourrilhes <jt@hpl.hp.com>

Acked-by: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/net/irda/irda_device.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff -puN net/irda/irda_device.c~irda_device-oops-fix net/irda/irda_device.c
--- 25/net/irda/irda_device.c~irda_device-oops-fix	2005-04-12 03:21:08.744807488 -0700
+++ 25-akpm/net/irda/irda_device.c	2005-04-12 03:21:08.747807032 -0700
@@ -125,8 +125,15 @@ void irda_device_set_media_busy(struct n
 
 	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;
_