summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhu Yi <yi.zhu@intel.com>2006-02-14 16:02:22 +0800
committerJohn W. Linville <linville@tuxdriver.com>2006-03-17 15:08:02 -0500
commit85149bace30eae1dc1f86d2c327329673123dd22 (patch)
tree53bf83b9b3bde433cc79f82479ba1dab5df5cc85
parentf697014af90c1db3c7b299327bf5a9548945b8bf (diff)
downloadkernel-crypto-85149bace30eae1dc1f86d2c327329673123dd22.tar.gz
kernel-crypto-85149bace30eae1dc1f86d2c327329673123dd22.tar.xz
kernel-crypto-85149bace30eae1dc1f86d2c327329673123dd22.zip
[PATCH] ipw2200: fix a potential NULL pointer dereference
Only on CONFIG_IPW2200_DEBUG is not defined Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ipw2200.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 4722de13f1d..129891feb43 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -7809,12 +7809,10 @@ static void ipw_rx(struct ipw_priv *priv)
while (i != r) {
rxb = priv->rxq->queue[i];
-#ifdef CONFIG_IPW2200_DEBUG
if (unlikely(rxb == NULL)) {
printk(KERN_CRIT "Queue not allocated!\n");
break;
}
-#endif
priv->rxq->queue[i] = NULL;
pci_dma_sync_single_for_cpu(priv->pci_dev, rxb->dma_addr,