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

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

drivers/mmc/host/sdhci.c

+4 −5
Original line number Diff line number Diff line
@@ -1347,11 +1347,10 @@ 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;

	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);

		ret = -ENODEV;

		goto unmap;

	}

		mmc->max_blk_size = 512;

	} else

		mmc->max_blk_size = 512 << mmc->max_blk_size;



	/*