summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2006-07-11 21:07:10 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-07-13 16:17:46 +0100
commit8b1b21853bab15fe5b60b8222786fe036c4dc365 (patch)
tree670d843e60ab985af0fcf166af38e6a1fed1085a
parentfb61e2895170920564410baadf71c5b3561dbf42 (diff)
downloadop-kernel-dev-8b1b21853bab15fe5b60b8222786fe036c4dc365.zip
op-kernel-dev-8b1b21853bab15fe5b60b8222786fe036c4dc365.tar.gz
[MMC] Change SDHCI version error to a warning
O2 Micro's controllers have a larger specification version value and are therefore denied by the driver. When bypassing this check they seem to work fine. This patch makes the code a bit more forgiving by changing the error to a warning. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/mmc/sdhci.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 6aba4a0..4e21b3b 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -1193,10 +1193,8 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)
version = (version & SDHCI_SPEC_VER_MASK) >> SDHCI_SPEC_VER_SHIFT;
if (version != 0) {
printk(KERN_ERR "%s: Unknown controller version (%d). "
- "Cowardly refusing to continue.\n", host->slot_descr,
+ "You may experience problems.\n", host->slot_descr,
version);
- ret = -ENODEV;
- goto unmap;
}
caps = readl(host->ioaddr + SDHCI_CAPABILITIES);
OpenPOWER on IntegriCloud