Commit b5f2e56909fb8fc02325f621e05ae01c5532d594
Exists in
smarc-ti-linux-3.14.y
and in
1 other branch
Merge branch 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-int…
…egration-tree/connectivity-ti-linux-kernel into ti-linux-3.14.y TI-Feature: connectivity TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git TI-Branch: connectivity-ti-linux-3.14.y * 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel: mmc: host: omap_hsmmc: Fix DTO and DCRC handling Signed-off-by: Dan Murphy <DMurphy@ti.com>
Showing 1 changed file Side-by-side Diff
drivers/mmc/host/omap_hsmmc.c
| ... | ... | @@ -1358,6 +1358,10 @@ |
| 1358 | 1358 | |
| 1359 | 1359 | if (status & (CTO_EN | CCRC_EN)) |
| 1360 | 1360 | end_cmd = 1; |
| 1361 | + if (host->data || host->response_busy) { | |
| 1362 | + end_trans = !end_cmd; | |
| 1363 | + host->response_busy = 0; | |
| 1364 | + } | |
| 1361 | 1365 | if (status & (CTO_EN | DTO_EN)) |
| 1362 | 1366 | hsmmc_command_incomplete(host, -ETIMEDOUT, end_cmd); |
| 1363 | 1367 | else if (status & (CCRC_EN | DCRC_EN)) |
| ... | ... | @@ -1376,10 +1380,6 @@ |
| 1376 | 1380 | hsmmc_command_incomplete(host, error, end_cmd); |
| 1377 | 1381 | } |
| 1378 | 1382 | dev_dbg(mmc_dev(host->mmc), "AC12 err: 0x%x\n", ac12); |
| 1379 | - } | |
| 1380 | - if (host->data || host->response_busy) { | |
| 1381 | - end_trans = !end_cmd; | |
| 1382 | - host->response_busy = 0; | |
| 1383 | 1383 | } |
| 1384 | 1384 | } |
| 1385 | 1385 |