From: Pierre Ossman A base clock value of 0 means that the driver must get the base clock through some other means. As we have no other way of getting it, we must abort. Signed-off-by: Pierre Ossman Cc: Russell King Signed-off-by: Andrew Morton --- drivers/mmc/sdhci.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff -puN drivers/mmc/sdhci.c~mmc-check-sdhci-base-clock drivers/mmc/sdhci.c --- 25/drivers/mmc/sdhci.c~mmc-check-sdhci-base-clock Tue Jun 27 14:28:19 2006 +++ 25-akpm/drivers/mmc/sdhci.c Tue Jun 27 14:28:19 2006 @@ -1030,7 +1030,14 @@ static int __devinit sdhci_probe_slot(st else /* XXX: Hack to get MMC layer to avoid highmem */ pdev->dma_mask = 0; - host->max_clk = (caps & SDHCI_CLOCK_BASE_MASK) >> SDHCI_CLOCK_BASE_SHIFT; + host->max_clk = + (caps & SDHCI_CLOCK_BASE_MASK) >> SDHCI_CLOCK_BASE_SHIFT; + if (host->max_clk == 0) { + printk(KERN_ERR "%s: Hardware doesn't specify base clock " + "frequency.\n", host->slot_descr); + ret = -ENODEV; + goto unmap; + } host->max_clk *= 1000000; /* @@ -1078,7 +1085,7 @@ static int __devinit sdhci_probe_slot(st ret = request_irq(host->irq, sdhci_irq, SA_SHIRQ, host->slot_descr, host); if (ret) - goto unmap; + goto untasklet; sdhci_init(host); @@ -1097,10 +1104,10 @@ static int __devinit sdhci_probe_slot(st return 0; -unmap: +untasklet: tasklet_kill(&host->card_tasklet); tasklet_kill(&host->finish_tasklet); - +unmap: iounmap(host->ioaddr); release: pci_release_region(pdev, host->bar); _