[PATCH] mmc: core: fix the critical bug for multiple block read

[PATCH] mmc: core: fix the critical bug for multiple block read

[Jaehoon Chung]

This patch is fixed the critical bug for multiple block read.

In Paul's patch(commit:6d621423128909f09072835445ce36dd357a758a),
used MMC_CAP2_NO_MULTI_READ. But that value was assigned host->mmc->caps.

MMC_CAPS2_NO_MULTI_READ must assign host->mmc->caps2 instead of host->mmc->caps.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
 drivers/mmc/card/block.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 4fd5723..1882149 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1037,7 +1037,7 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
 			brq->data.blocks = 1;
 
 		/* Some controllers can't do multiblock reads due to hw bugs */
-		if (card->host->caps & MMC_CAP2_NO_MULTI_READ &&
+		if (card->host->caps2 & MMC_CAP2_NO_MULTI_READ &&
 		    rq_data_dir(req) == READ)
 			brq->data.blocks = 1;
 	}

Re: [PATCH] mmc: core: fix the critical bug for multiple block read

[Jaehoon Chung]

Sorry card->host->caps instead of host->mmc->caps.(typo)

On 10/31/2011 07:46 PM, Jaehoon Chung wrote:

> This patch is fixed the critical bug for multiple block read.
> 
> In Paul's patch(commit:6d621423128909f09072835445ce36dd357a758a),
> used MMC_CAP2_NO_MULTI_READ. But that value was assigned card->host->caps.
> 
> MMC_CAPS2_NO_MULTI_READ must assign card->host->caps2 instead of card->host->caps.
> 
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> ---
>  drivers/mmc/card/block.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
> index 4fd5723..1882149 100644
> --- a/drivers/mmc/card/block.c
> +++ b/drivers/mmc/card/block.c
> @@ -1037,7 +1037,7 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
>  			brq->data.blocks = 1;
>  
>  		/* Some controllers can't do multiblock reads due to hw bugs */
> -		if (card->host->caps & MMC_CAP2_NO_MULTI_READ &&
> +		if (card->host->caps2 & MMC_CAP2_NO_MULTI_READ &&
>  		    rq_data_dir(req) == READ)
>  			brq->data.blocks = 1;
>  	}
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH] mmc: core: fix the critical bug for multiple block read

[Chris Ball]

Hi,

On Mon, Oct 31 2011, Jaehoon Chung wrote:
> diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
> index 4fd5723..1882149 100644
> --- a/drivers/mmc/card/block.c
> +++ b/drivers/mmc/card/block.c
> @@ -1037,7 +1037,7 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
>  			brq->data.blocks = 1;
>  
>  		/* Some controllers can't do multiblock reads due to hw bugs */
> -		if (card->host->caps & MMC_CAP2_NO_MULTI_READ &&
> +		if (card->host->caps2 & MMC_CAP2_NO_MULTI_READ &&
>  		    rq_data_dir(req) == READ)
>  			brq->data.blocks = 1;
>  	}
>

Already fixed in mmc-next, with a rebase.  Thanks,

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child