diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-01-13 12:01:52 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-01-13 12:01:52 +0800 |
commit | e30546378ec2c5cc1a5ef97695d8ba859b0abd23 (patch) | |
tree | 0a3c9d9ac448694a039a63db6549cfaebdaea07f /drivers/mmc/card | |
parent | 7785301d9209cf083369c6f088cd1d48ec417863 (diff) | |
parent | 99d4c5fe0b7838de15c59b375491ef075848d92d (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/mmc/card')
-rw-r--r-- | drivers/mmc/card/mmc_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c index 7fc9174d4619..9a11aaa6e985 100644 --- a/drivers/mmc/card/mmc_test.c +++ b/drivers/mmc/card/mmc_test.c @@ -791,7 +791,7 @@ static int mmc_test_nonblock_transfer(struct mmc_test_card *test, struct mmc_async_req *cur_areq = &test_areq[0].areq; struct mmc_async_req *other_areq = &test_areq[1].areq; int i; - int ret; + int ret = RESULT_OK; test_areq[0].test = test; test_areq[1].test = test; |