Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / drivers / mtd / chips / jedec_probe.c

diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index 159ccc0..cbef6f1 100644 (file)
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -1480,7 +1480,7 @@ static int cfi_jedec_setup(struct cfi_private *p_cfi, int index)
        for (i=0; i<num_erase_regions; i++){
                p_cfi->cfiq->EraseRegionInfo[i] = jedec_table[index].regions[i];
        }
-       p_cfi->cmdset_priv = 0;
+       p_cfi->cmdset_priv = NULL;
 
        /* This may be redundant for some cases, but it doesn't hurt */
        p_cfi->mfr = jedec_table[index].mfr_id;