summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/card/mmc_test.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-18 17:55:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-18 17:55:15 -0800
commit59af0a0b5848caf38f1bf7013905c3e9cdba4d1d (patch)
tree485484cd9c58631a06f5a2f07abc6db4c2bc6f2f /drivers/mmc/card/mmc_test.c
parentf04b30de3c82528f1ab4c58b3dd4c975f5341901 (diff)
parent3ebf74b1de9f94da4291db3ea1ae11c5bedb5784 (diff)
downloadlinux-59af0a0b5848caf38f1bf7013905c3e9cdba4d1d.tar.gz
linux-59af0a0b5848caf38f1bf7013905c3e9cdba4d1d.tar.bz2
linux-59af0a0b5848caf38f1bf7013905c3e9cdba4d1d.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: omap_hsmmc: Change while(); loops with finite version omap_hsmmc: recover from transfer failures omap_hsmmc: only MMC1 allows HCTL.SDVS != 1.8V omap_hsmmc: card detect irq bugfix sdhci: fix led naming mmc_test: fix basic read test s3cmci: Fix hangup in do_pio_write() Revert "sdhci: force high speed capability on some controllers" MMC: fix bug - SDHC card capacity not correct
Diffstat (limited to 'drivers/mmc/card/mmc_test.c')
-rw-r--r--drivers/mmc/card/mmc_test.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c
index b92b172074ee..b9f1e84897cc 100644
--- a/drivers/mmc/card/mmc_test.c
+++ b/drivers/mmc/card/mmc_test.c
@@ -494,7 +494,7 @@ static int mmc_test_basic_read(struct mmc_test_card *test)
sg_init_one(&sg, test->buffer, 512);
- ret = mmc_test_simple_transfer(test, &sg, 1, 0, 1, 512, 1);
+ ret = mmc_test_simple_transfer(test, &sg, 1, 0, 1, 512, 0);
if (ret)
return ret;