---

yaml --- r: 326711 b: refs/heads/master c: 6e308f8 h: refs/heads/master i: 326709: 9ca0116 326707: 74e22f9 326703: f29fc64 v: v3
git-mirror · Aug 20, 2012 · b4754e0 · b4754e0
1 parent 7b524ec
commit b4754e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8bbb55266f48e4c227ade192244a692710b9aae
+refs/heads/master: 6e308f87c821e5b9316d9eb69e96d8a33910412a
diff --git a/trunk/drivers/mtd/nand/pxa3xx_nand.c b/trunk/drivers/mtd/nand/pxa3xx_nand.c
@@ -1034,7 +1034,7 @@ static int alloc_nand_resource(struct platform_device *pdev)
 	struct pxa3xx_nand_platform_data *pdata;
 	struct pxa3xx_nand_info *info;
 	struct pxa3xx_nand_host *host;
-	struct nand_chip *chip;
+	struct nand_chip *chip = NULL;
 	struct mtd_info *mtd;
 	struct resource *r;
 	int ret, irq, cs;
@@ -1244,7 +1244,7 @@ static int pxa3xx_nand_probe_dt(struct platform_device *pdev)
 	return 0;
 }
 #else
-static inline int pxa3xx_nand_probe_dt(struct platform_device *)
+static inline int pxa3xx_nand_probe_dt(struct platform_device *pdev)
 {
 	return 0;
 }