| Message ID | 1402002881-1986640-3-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 5 Jun 2014, Arnd Bergmann wrote: > 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> > --- > drivers/mmc/host/mvsdio.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c > index 9377284..6b4c5ad 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) > 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 " > -- > 1.8.3.2 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c index 9377284..6b4c5ad 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) 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 "
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 --- drivers/mmc/host/mvsdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)