Skip to content

Commit

Permalink
[PATCH] irda_device() oops fix
Browse files Browse the repository at this point in the history
Acked-by: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Jean Tourrilhes authored and Linus Torvalds committed Apr 16, 2005
1 parent 6775cab commit 7e5c6bc
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions net/irda/irda_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 7e5c6bc

Please sign in to comment.