The following commit has been merged in the linux branch: commit 0af49167b1e5ba154e90d2c454bf4624ee47df80 Author: Darren Salt linux@youmustbejoking.demon.co.uk Date: Wed Oct 14 02:19:22 2009 +0100

Staging: rt2860sta: prevent a panic when disabling when associated

This fixes a panic which is triggered when the hardware "disappears" from beneath the driver, i.e. when wireless is toggled off via Fn-F2 on various EeePC models.

Ref. bug report http://bugzilla.kernel.org/show_bug.cgi?id=13390 panic http://bugzilla.kernel.org/attachment.cgi?id=21928

Signed-off-by: Darren Salt linux@youmustbejoking.demon.co.uk Cc: stable stable@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@suse.de

diff --git a/drivers/staging/rt2860/common/cmm_data_2860.c b/drivers/staging/rt2860/common/cmm_data_2860.c index fb17355..857ff45 100644 --- a/drivers/staging/rt2860/common/cmm_data_2860.c +++ b/drivers/staging/rt2860/common/cmm_data_2860.c @@ -363,6 +363,8 @@ int RtmpPCIMgmtKickOut( ULONG SwIdx = pAd->MgmtRing.TxCpuIdx;

pTxD = (PTXD_STRUC) pAd->MgmtRing.Cell[SwIdx].AllocVa; + if (!pTxD) + return 0;

pAd->MgmtRing.Cell[SwIdx].pNdisPacket = pPacket; pAd->MgmtRing.Cell[SwIdx].pNextNdisPacket = NULL;