diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-06-05 17:14:39 -0400 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-06-12 04:50:27 -0400 |
commit | d7fe833f3fc9a02806c96dd28f48e5e28c8484a8 (patch) | |
tree | bc09795e0077d2755541244979561319a0c7ea55 | |
parent | bf614c7a214592c4cd2a2ccffc0f43539437af6b (diff) |
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>
-rw-r--r-- | drivers/mmc/host/mvsdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c index 9377284f8544..6b4c5ad3b393 100644 --- 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) | |||
79 | unsigned long t = jiffies + HZ; | 79 | unsigned long t = jiffies + HZ; |
80 | unsigned int hw_state, count = 0; | 80 | unsigned int hw_state, count = 0; |
81 | do { | 81 | do { |
82 | hw_state = mvsd_read(MVSD_HW_STATE); | ||
82 | if (time_after(jiffies, t)) { | 83 | if (time_after(jiffies, t)) { |
83 | dev_warn(host->dev, "FIFO_EMPTY bit missing\n"); | 84 | dev_warn(host->dev, "FIFO_EMPTY bit missing\n"); |
84 | break; | 85 | break; |
85 | } | 86 | } |
86 | hw_state = mvsd_read(MVSD_HW_STATE); | ||
87 | count++; | 87 | count++; |
88 | } while (!(hw_state & (1 << 13))); | 88 | } while (!(hw_state & (1 << 13))); |
89 | dev_dbg(host->dev, "*** wait for FIFO_EMPTY bit " | 89 | dev_dbg(host->dev, "*** wait for FIFO_EMPTY bit " |