From ba8f7232c3485b997356fe5b52926549bc465c4c Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 14 Oct 2009 02:19:22 +0100 Subject: [PATCH] --- yaml --- r: 167568 b: refs/heads/master c: 0af49167b1e5ba154e90d2c454bf4624ee47df80 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/rt2860/common/cmm_data_2860.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 56767a8cd125..b55374dbfa76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f267996eb4501b45beecdfe7c9a9af714fc083f +refs/heads/master: 0af49167b1e5ba154e90d2c454bf4624ee47df80 diff --git a/trunk/drivers/staging/rt2860/common/cmm_data_2860.c b/trunk/drivers/staging/rt2860/common/cmm_data_2860.c index fb1735533b74..857ff450b6c9 100644 --- a/trunk/drivers/staging/rt2860/common/cmm_data_2860.c +++ b/trunk/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;