aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorKalimochoAz <calimochoazucarado@gmail.com>2012-04-18 17:52:00 +0200
committerKalimochoAz <calimochoazucarado@gmail.com>2012-04-18 17:52:00 +0200
commitdecc49dfad34504a9ff12c721e5fd0baf56a0444 (patch)
tree3425650b7f659ba2c9ba3690c8668ebd286075bb /drivers/mmc
parent65e6f0b461da6590830416b104c665f147f13178 (diff)
parent0527fde0639955203ad48a9fd83bd6fc35e82e07 (diff)
downloadkernel_samsung_crespo-decc49dfad34504a9ff12c721e5fd0baf56a0444.zip
kernel_samsung_crespo-decc49dfad34504a9ff12c721e5fd0baf56a0444.tar.gz
kernel_samsung_crespo-decc49dfad34504a9ff12c721e5fd0baf56a0444.tar.bz2
Merge branch 'linux-3.0.y' into ics
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/atmel-mci.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index aa8039f..b6cd386 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -468,7 +468,14 @@ err:
static inline unsigned int ns_to_clocks(struct atmel_mci *host,
unsigned int ns)
{
- return (ns * (host->bus_hz / 1000000) + 999) / 1000;
+ /*
+ * It is easier here to use us instead of ns for the timeout,
+ * it prevents from overflows during calculation.
+ */
+ unsigned int us = DIV_ROUND_UP(ns, 1000);
+
+ /* Maximum clock frequency is host->bus_hz/2 */
+ return us * (DIV_ROUND_UP(host->bus_hz, 2000000));
}
static void atmci_set_timeout(struct atmel_mci *host,