Commit 03f8590d authored by David Vrabel's avatar David Vrabel Committed by Pierre Ossman

mmc: ignore bad max block size in sdhci

Some SDHC cards report an invalid maximum block size, in these cases
assume they support block sizes up to 512 bytes instead of returning
an error.
Signed-off-by: default avatarDavid Vrabel <david.vrabel@csr.com>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 2b061973
...@@ -1347,12 +1347,11 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot) ...@@ -1347,12 +1347,11 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)
*/ */
mmc->max_blk_size = (caps & SDHCI_MAX_BLOCK_MASK) >> SDHCI_MAX_BLOCK_SHIFT; mmc->max_blk_size = (caps & SDHCI_MAX_BLOCK_MASK) >> SDHCI_MAX_BLOCK_SHIFT;
if (mmc->max_blk_size >= 3) { if (mmc->max_blk_size >= 3) {
printk(KERN_ERR "%s: Invalid maximum block size.\n", printk(KERN_WARNING "%s: Invalid maximum block size, assuming 512\n",
host->slot_descr); host->slot_descr);
ret = -ENODEV; mmc->max_blk_size = 512;
goto unmap; } else
} mmc->max_blk_size = 512 << mmc->max_blk_size;
mmc->max_blk_size = 512 << mmc->max_blk_size;
/* /*
* Maximum block count. * Maximum block count.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment