From: Andrew Morton <akpm@osdl.org>
Date: Mon, 12 Jun 2006 21:10:22 +0000 (+0100)
Subject: [MMC] sdhci truncated pointer fix
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e474c66b1c76f9755f5d6dd5bfe88ce5e0435184;p=deliverable%2Flinux.git

[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>
---

diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index b0053280ff2d..6bfcdbc7491e 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);