MMC updates
Subsystems (2)
Linus, please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus
to receive the following updates:
drivers/mmc/core/sd.c | 15 +++++++++++++++ drivers/mmc/host/omap.c | 24 +++--------------------- 2 files changed, 18 insertions(+), 21 deletions(-)
Pierre Ossman (1):
mmc: get back read-only switch function
Ragner Magalhaes (1):
mmc-omap: fix sd response type 6 vs. 1
drivers/mmc/core/sd.c +15 -0
@@ -427,6 +427,21 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,mmc_set_bus_width (host,MMC_BUS_WIDTH_4 ); } +/* +* Check if read-only switch is active. +*/ +if (!oldcard) { +if (!host->ops->get_ro) { +printk (KERN_WARNING "%s: host does not " +"support reading read-only " +"switch. assuming write-enable.\n" , +mmc_hostname (host)); + }else { +if (host->ops->get_ro (host)) +mmc_card_set_readonly (card); + } + } +if (!oldcard) host->card = card;
drivers/mmc/host/omap.c +0 -1
@@ -522,28 +522,10 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id) }if (status &OMAP_MMC_STAT_CARD_ERR ) { - if (host->cmd && host->cmd->opcode ==
MMC_STOP_TRANSMISSION) {
- u32 response = OMAP_MMC_READ(host, RSP6)
- | (OMAP_MMC_READ(host, RSP7) << 16);
- /* STOP sometimes sets must-ignore bits */
- if (!(response & (R1_CC_ERROR
- | R1_ILLEGAL_COMMAND
- |R1_COM_CRC_ERROR))) {
- end_command = 1;
- continue;
- }
- }
-
- dev_dbg(mmc_dev(host->mmc), "card status error (CMD%d)\n",
+ dev_dbg(mmc_dev(host->mmc),
+ "ignoring card status error (CMD%d)\n",
host->cmd->opcode);
- if (host->cmd) {
- host->cmd->error = MMC_ERR_FAILED;
- end_command = 1;
- }
- if (host->data) {
- host->data->error = MMC_ERR_FAILED;
- transfer_error = 1;
- }
+ end_command = 1;
}
/*Signature · 5 lines
-- Pierre Ossman Linux kernel, MMC maintainer http://www.kernel.org PulseAudio, core developer http://pulseaudio.org rdesktop, core developer http://www.rdesktop.org