diff options
| author |   Andrew Morton <akpm@osdl.org> | 2006-06-12 22:10:22 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2006-06-12 22:10:22 +0100 |
| commit | e474c66b1c76f9755f5d6dd5bfe88ce5e0435184 (patch) | |
| tree | 4034e9825a19b1ae1bed578ca03f595c0c282c36 /drivers/mmc/sdhci.c | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
| download | linux-dev-e474c66b1c76f9755f5d6dd5bfe88ce5e0435184.tar.xz linux-dev-e474c66b1c76f9755f5d6dd5bfe88ce5e0435184.zip | |
[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 '')
| -rw-r--r-- | drivers/mmc/sdhci.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |