omap_hsmmc: fix scatter-gather list sanity checking
Subsystems (2)
PATCH 58/232 omap_hsmmc: fix scatter-gather list sanity checking
From: Jarkko Lavinen <[email protected]>
Do not use host->dma_len when it is uninitialzed. Finish the request with an error if the mmc_omap_prepare_data() fails.
Signed-off-by Jarkko Lavinen <[email protected]>
Signed-off-by Adrian Hunter <[email protected]>
Acked-by Matt Fleming <[email protected]>
Cc Ian Molton <[email protected]>
Cc "Roberto A. Foglietta" <[email protected]>
Cc Jarkko Lavinen <[email protected]>
Cc Denis Karpov <[email protected]>
Cc Pierre Ossman <[email protected]>
Cc Philip Langdale <[email protected]>
Cc "Madhusudhan" <[email protected]>
Cc <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/mmc/host/omap_hsmmc.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/mmc/host/omap_hsmmc.c renamed from drivers/mmc/host/omap_hsmmc.c~omap_hsmmc-fix-scatter-gather-list-sanity-checking +12 -2
@@ -878,7 +878,7 @@ mmc_omap_start_dma_transfer(struct mmc_ostruct mmc_data *data = req->data;/* Sanity check: all the SG entries must be aligned by block size. */ -for (i =0 ; i < host->dma_len; i++) { +for (i =0 ; i < data->sg_len; i++) {struct scatterlist *sgl; sgl = data->sg + i;
@@ -1021,10 +1021,20 @@ static int omap_mmc_disable(struct mmc_hstatic void omap_mmc_request (struct mmc_host *mmc,struct mmc_request *req) {struct mmc_omap_host *host =mmc_priv (mmc); +int err;WARN_ON (host->mrq !=NULL ); host->mrq = req; -mmc_omap_prepare_data (host, req); + err =mmc_omap_prepare_data (host, req); +if (err) { + req->cmd->error = err; +if (req->data) + req->data->error = err; + host->mrq =NULL ; +mmc_request_done (mmc, req); +return ; + } +mmc_omap_start_command (host, req->cmd, req->data); }
_