summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-06-12 22:10:22 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-06-12 22:10:22 +0100
commite474c66b1c76f9755f5d6dd5bfe88ce5e0435184 (patch)
tree4034e9825a19b1ae1bed578ca03f595c0c282c36 /drivers/mmc
parent0e838b72d54ed189033939258a961f2a0cd59647 (diff)
downloadop-kernel-dev-e474c66b1c76f9755f5d6dd5bfe88ce5e0435184.zip
op-kernel-dev-e474c66b1c76f9755f5d6dd5bfe88ce5e0435184.tar.gz
[MMC] sdhci truncated pointer fix
On 64-bit machines, we just lost the uppermost 32 bits. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/sdhci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index b005328..6bfcdbc 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -1073,7 +1073,7 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)
tasklet_init(&host->finish_tasklet,
sdhci_tasklet_finish, (unsigned long)host);
- setup_timer(&host->timer, sdhci_timeout_timer, (int)host);
+ setup_timer(&host->timer, sdhci_timeout_timer, (long)host);
ret = request_irq(host->irq, sdhci_irq, SA_SHIRQ,
host->slot_descr, host);
OpenPOWER on IntegriCloud