From fb61e2895170920564410baadf71c5b3561dbf42 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Tue, 11 Jul 2006 21:06:48 +0200 Subject: [MMC] Fix incorrect register access There was a writel() being used on a 16-bit register. Signed-off-by: Pierre Ossman Signed-off-by: Russell King --- drivers/mmc/sdhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/mmc/sdhci.c') diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 893319108ba..6aba4a0f61a 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); } -- cgit v1.2.3 From 8b1b21853bab15fe5b60b8222786fe036c4dc365 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Tue, 11 Jul 2006 21:07:10 +0200 Subject: [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 Signed-off-by: Russell King --- drivers/mmc/sdhci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers/mmc/sdhci.c') diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 6aba4a0f61a..4e21b3b9d33 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); -- cgit v1.2.3