summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2014-09-18 23:33:49 +0400
committerUlf Hansson <ulf.hansson@linaro.org>2014-09-19 20:43:09 +0200
commitbb98d9d1d2e791f368295c9c09c9a03fe3ac0e62 (patch)
treecba9ae3ea8c136a404e2dce04b31f9a5f09bcc41 /drivers
parentb9bd7ff8069a7125da897de657da421c497d4f15 (diff)
downloadlinux-bb98d9d1d2e791f368295c9c09c9a03fe3ac0e62.tar.bz2
mmc: tmio: prevent endless loop in tmio_mmc_set_clock()
I spent a couple of days with the driver just hanging due to me forgetting to specify the external crystal frequency, so that clk_get_rate() returned 0 and thus the loop in tmio_mmc_set_clock() never ended. I don't think that's an acceptable behavior, so I suggest that the minimum frequency is checked for 0 in tmio_mmc_host_probe(). Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Acked-by: Ian Molton <ian.molton@codethink.co.uk> Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/tmio_mmc_pio.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index 692e578cf4d7..e487ba4bb01a 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -1122,6 +1122,15 @@ int tmio_mmc_host_probe(struct tmio_mmc_host **host,
}
/*
+ * Check the sanity of mmc->f_min to prevent tmio_mmc_set_clock() from
+ * looping forever...
+ */
+ if (mmc->f_min == 0) {
+ ret = -EINVAL;
+ goto host_free;
+ }
+
+ /*
* While using internal tmio hardware logic for card detection, we need
* to ensure it stays powered for it to work.
*/