mmc: tmio: prevent endless loop in tmio_mmc_set_clock()
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Thu, 18 Sep 2014 19:33:49 +0000 (23:33 +0400)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 01:39:27 +0000 (10:39 +0900)
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>
(cherry picked from commit bb98d9d1d2e791f368295c9c09c9a03fe3ac0e62)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
drivers/mmc/host/tmio_mmc_pio.c

index 692e578..e487ba4 100644 (file)
@@ -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.
         */