aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-07-13 16:38:30 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-13 16:38:30 -0700
commit300c215acd2462223a6595d3562dad67d0e10afd (patch)
tree3fd31750a36471dcb8ba0c61b5ba2d97a8dbe5c7
parent7b69a4c360e8787877ebf5e42609b8bab13afa6a (diff)
parent8b1b21853bab15fe5b60b8222786fe036c4dc365 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
* master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] Change SDHCI version error to a warning [MMC] Fix incorrect register access
-rw-r--r--drivers/mmc/sdhci.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 893319108ba..4e21b3b9d33 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -565,7 +565,7 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
if (cmd->data)
flags |= SDHCI_CMD_DATA;
- writel(SDHCI_MAKE_CMD(cmd->opcode, flags),
+ writew(SDHCI_MAKE_CMD(cmd->opcode, flags),
host->ioaddr + SDHCI_COMMAND);
}
@@ -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);