diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 15:51:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 15:51:13 -0800 |
| commit | f3e39e67b9b6ad6a51d13be902e8341f13b93531 (patch) | |
| tree | dd0d21776b936fdff1bd1e1ba762fc47e94259cf /drivers/mmc/mmci.c | |
| parent | 1a56f54c351d8d2e276aefc4f4094037c178d6c7 (diff) | |
| parent | e92251762d02a46177d4105d1744041e3f8bc465 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'drivers/mmc/mmci.c')
| -rw-r--r-- | drivers/mmc/mmci.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c index 634ef53e85a..37ee7f8dc82 100644 --- a/drivers/mmc/mmci.c +++ b/drivers/mmc/mmci.c @@ -124,15 +124,10 @@ mmci_start_command(struct mmci_host *host, struct mmc_command *cmd, u32 c) } c |= cmd->opcode | MCI_CPSM_ENABLE; - switch (cmd->flags & MMC_RSP_MASK) { - case MMC_RSP_NONE: - default: - break; - case MMC_RSP_LONG: - c |= MCI_CPSM_LONGRSP; - case MMC_RSP_SHORT: + if (cmd->flags & MMC_RSP_PRESENT) { + if (cmd->flags & MMC_RSP_136) + c |= MCI_CPSM_LONGRSP; c |= MCI_CPSM_RESPONSE; - break; } if (/*interrupt*/0) c |= MCI_CPSM_INTERRUPT; |