AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-12 00:26:43 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge master.kernel.org:/home/rmk/linux-2.6-mmc

Browse Source 
* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [MMC] Change SDHCI version error to a warning
  [MMC] Fix incorrect register access
This commit is contained in:
Linus Torvalds 2006-07-13 16:38:30 -07:00
commit 300c215acd
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mmc/sdhci.c
View File

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