diff options
| -rw-r--r-- | drivers/mmc/sdhci.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 893319108ba4..4e21b3b9d330 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) | |||
| 565 | if (cmd->data) | 565 | if (cmd->data) |
| 566 | flags |= SDHCI_CMD_DATA; | 566 | flags |= SDHCI_CMD_DATA; |
| 567 | 567 | ||
| 568 | writel(SDHCI_MAKE_CMD(cmd->opcode, flags), | 568 | writew(SDHCI_MAKE_CMD(cmd->opcode, flags), |
| 569 | host->ioaddr + SDHCI_COMMAND); | 569 | host->ioaddr + SDHCI_COMMAND); |
| 570 | } | 570 | } |
| 571 | 571 | ||
| @@ -1193,10 +1193,8 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot) | |||
| 1193 | version = (version & SDHCI_SPEC_VER_MASK) >> SDHCI_SPEC_VER_SHIFT; | 1193 | version = (version & SDHCI_SPEC_VER_MASK) >> SDHCI_SPEC_VER_SHIFT; |
| 1194 | if (version != 0) { | 1194 | if (version != 0) { |
| 1195 | printk(KERN_ERR "%s: Unknown controller version (%d). " | 1195 | printk(KERN_ERR "%s: Unknown controller version (%d). " |
| 1196 | "Cowardly refusing to continue.\n", host->slot_descr, | 1196 | "You may experience problems.\n", host->slot_descr, |
| 1197 | version); | 1197 | version); |
| 1198 | ret = -ENODEV; | ||
| 1199 | goto unmap; | ||
| 1200 | } | 1198 | } |
| 1201 | 1199 | ||
| 1202 | caps = readl(host->ioaddr + SDHCI_CAPABILITIES); | 1200 | caps = readl(host->ioaddr + SDHCI_CAPABILITIES); |
