|
@@ -1534,7 +1534,10 @@ static void dw_mci_tasklet_func(unsigned long priv)
|
|
|
if (test_and_clear_bit(EVENT_DATA_ERROR,
|
|
if (test_and_clear_bit(EVENT_DATA_ERROR,
|
|
|
&host->pending_events)) {
|
|
&host->pending_events)) {
|
|
|
dw_mci_stop_dma(host);
|
|
dw_mci_stop_dma(host);
|
|
|
- send_stop_abort(host, data);
|
|
|
|
|
|
|
+ if (data->stop ||
|
|
|
|
|
+ !(host->data_status & (SDMMC_INT_DRTO |
|
|
|
|
|
+ SDMMC_INT_EBE)))
|
|
|
|
|
+ send_stop_abort(host, data);
|
|
|
state = STATE_DATA_ERROR;
|
|
state = STATE_DATA_ERROR;
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
@@ -1561,7 +1564,10 @@ static void dw_mci_tasklet_func(unsigned long priv)
|
|
|
if (test_and_clear_bit(EVENT_DATA_ERROR,
|
|
if (test_and_clear_bit(EVENT_DATA_ERROR,
|
|
|
&host->pending_events)) {
|
|
&host->pending_events)) {
|
|
|
dw_mci_stop_dma(host);
|
|
dw_mci_stop_dma(host);
|
|
|
- send_stop_abort(host, data);
|
|
|
|
|
|
|
+ if (data->stop ||
|
|
|
|
|
+ !(host->data_status & (SDMMC_INT_DRTO |
|
|
|
|
|
+ SDMMC_INT_EBE)))
|
|
|
|
|
+ send_stop_abort(host, data);
|
|
|
state = STATE_DATA_ERROR;
|
|
state = STATE_DATA_ERROR;
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|