From: Simon Glass <sjg@chromium.org>
Date: Wed, 2 Dec 2015 17:59:11 +0000 (-0700)
Subject: spl: mmc: Fix compiler warning with CONFIG_DM_MMC
X-Git-Tag: v2016.01-rc2~21
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d773a008ee3135b28becc5ebce050c931767fed8;p=u-boot

spl: mmc: Fix compiler warning with CONFIG_DM_MMC

Since commit 4188ba3 we get the following warning on rockchip boards:

common/spl/spl_mmc.c:31:24: warning: ‘mmc’ may be used uninitialized in this function [-Wmaybe-uninitialized]
  count = mmc->block_dev.block_read(0, sector, 1, header);
                        ^
common/spl/spl_mmc.c:251:14: note: ‘mmc’ was declared here
  struct mmc *mmc;

Correct this by move the variable init earlier.

Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Nikita Kiryanov <nikita@compulab.co.il>
---

diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index b3c2c642e4..43748d05b2 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -248,7 +248,7 @@ int spl_mmc_do_fs_boot(struct mmc *mmc)
 
 int spl_mmc_load_image(u32 boot_device)
 {
-	struct mmc *mmc;
+	struct mmc *mmc = NULL;
 	u32 boot_mode;
 	int err = 0;
 	__maybe_unused int part;