diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 17:16:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 17:16:11 -0400 |
| commit | 46b51ea2099fa2082342e52b8284aa828429b80b (patch) | |
| tree | 0a0d7bfe1aff036c86a2e7beacbd91398008bfb6 /drivers/mmc/host/mmci.c | |
| parent | 1fdb24e969110fafea36d3b393bea438f702c87f (diff) | |
| parent | a6029e1f75bb484c1f5bc68b6a8572e4024795bc (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (83 commits)
mmc: fix compile error when CONFIG_BLOCK is not enabled
mmc: core: Cleanup eMMC4.5 conditionals
mmc: omap_hsmmc: if multiblock reads are broken, disable them
mmc: core: add workaround for controllers with broken multiblock reads
mmc: core: Prevent too long response times for suspend
mmc: recognise SDIO cards with SDIO_CCCR_REV 3.00
mmc: sd: Handle SD3.0 cards not supporting UHS-I bus speed mode
mmc: core: support HPI send command
mmc: core: Add cache control for eMMC4.5 device
mmc: core: Modify the timeout value for writing power class
mmc: core: new discard feature support at eMMC v4.5
mmc: core: mmc sanitize feature support for v4.5
mmc: dw_mmc: modify DATA register offset
mmc: sdhci-pci: add flag for devices that can support runtime PM
mmc: omap_hsmmc: ensure pbias configuration is always done
mmc: core: Add Power Off Notify Feature eMMC 4.5
mmc: sdhci-s3c: fix potential NULL dereference
mmc: replace printk with appropriate display macro
mmc: core: Add default timeout value for CMD6
mmc: sdhci-pci: add runtime pm support
...
Diffstat (limited to 'drivers/mmc/host/mmci.c')
| -rw-r--r-- | drivers/mmc/host/mmci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 7be8db0f9f7d..50b5f9926f64 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c | |||
| @@ -466,7 +466,7 @@ static void mmci_get_next_data(struct mmci_host *host, struct mmc_data *data) | |||
| 466 | struct mmci_host_next *next = &host->next_data; | 466 | struct mmci_host_next *next = &host->next_data; |
| 467 | 467 | ||
| 468 | if (data->host_cookie && data->host_cookie != next->cookie) { | 468 | if (data->host_cookie && data->host_cookie != next->cookie) { |
| 469 | printk(KERN_WARNING "[%s] invalid cookie: data->host_cookie %d" | 469 | pr_warning("[%s] invalid cookie: data->host_cookie %d" |
| 470 | " host->next_data.cookie %d\n", | 470 | " host->next_data.cookie %d\n", |
| 471 | __func__, data->host_cookie, host->next_data.cookie); | 471 | __func__, data->host_cookie, host->next_data.cookie); |
| 472 | data->host_cookie = 0; | 472 | data->host_cookie = 0; |
| @@ -531,7 +531,7 @@ static void mmci_post_request(struct mmc_host *mmc, struct mmc_request *mrq, | |||
| 531 | if (chan) { | 531 | if (chan) { |
| 532 | if (err) | 532 | if (err) |
| 533 | dmaengine_terminate_all(chan); | 533 | dmaengine_terminate_all(chan); |
| 534 | if (err || data->host_cookie) | 534 | if (data->host_cookie) |
| 535 | dma_unmap_sg(mmc_dev(host->mmc), data->sg, | 535 | dma_unmap_sg(mmc_dev(host->mmc), data->sg, |
| 536 | data->sg_len, dir); | 536 | data->sg_len, dir); |
| 537 | mrq->data->host_cookie = 0; | 537 | mrq->data->host_cookie = 0; |