Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 300c215a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7b69a4c3 8b1b2185

drivers/mmc/sdhci.c

+2 −4
Original line number Diff line number Diff line
@@ -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);