mmc: mvsdio: avoid compiler warning

gcc correctly points out that hw_state can be used uninitially
in the mvsd_setup_data() function. This rearranges the function
to ensure it always contains a proper value.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Chris Ball <chris@printf.net>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: linux-mmc@vger.kernel.org
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index 9377284f8544be955d01e3839250c848928380c6..6b4c5ad3b3939c6103871eb790d304d1a1ad4f4d 100644 (file)
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -79,11 +79,11 @@ static int mvsd_setup_data(struct mvsd_host *host, struct mmc_data *data)
                unsigned long t = jiffies + HZ;
                unsigned int hw_state,  count = 0;
                do {
+                       hw_state = mvsd_read(MVSD_HW_STATE);
                        if (time_after(jiffies, t)) {
                                dev_warn(host->dev, "FIFO_EMPTY bit missing\n");
                                break;
                        }
-                       hw_state = mvsd_read(MVSD_HW_STATE);
                        count++;
                } while (!(hw_state & (1 << 13)));
                dev_dbg(host->dev, "*** wait for FIFO_EMPTY bit "