]> err.no Git - linux-2.6/commitdiff
[PATCH] ipw2200: fix a potential NULL pointer dereference
authorZhu Yi <yi.zhu@intel.com>
Tue, 14 Feb 2006 08:02:22 +0000 (16:02 +0800)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 17 Mar 2006 20:08:02 +0000 (15:08 -0500)
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>
drivers/net/wireless/ipw2200.c

index 4722de13f1db1344e9e3dc7b8d4b333fe6c9f253..129891feb43ffb2e315fea5361f1f2f5caeb4cc6 100644 (file)
@@ -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,