[PATCH 2/3] SDHCI: Don't assign mmc->caps at SDHCI directly

[PATCH 2/3] SDHCI: Don't assign mmc->caps at SDHCI directly

[Kyungmin Park]

From: Kyungmin Park <kyungmin.park@samsung.com>

Some host controller can set mmc->caps before sdhci_add_host.

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
 drivers/mmc/host/sdhci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 4321e0c..142419c 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1791,7 +1791,7 @@ int sdhci_add_host(struct sdhci_host *host)
 	else
 		mmc->f_min = host->max_clk / 256;
 	mmc->f_max = host->max_clk;
-	mmc->caps = MMC_CAP_SDIO_IRQ;
+	mmc->caps |= MMC_CAP_SDIO_IRQ;
 
 	if (!(host->quirks & SDHCI_QUIRK_FORCE_1_BIT_DATA))
 		mmc->caps |= MMC_CAP_4_BIT_DATA;
-- 
1.5.3.3

Re: [PATCH 2/3] SDHCI: Don't assign mmc->caps at SDHCI directly

[Andrew Morton]

On Sat, 12 Jun 2010 14:44:50 +0900
Kyungmin Park <kyungmin.park@samsung.com> wrote:

> From: Kyungmin Park <kyungmin.park@samsung.com>
> 
> Some host controller can set mmc->caps before sdhci_add_host.
> 
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> ---
>  drivers/mmc/host/sdhci.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 4321e0c..142419c 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -1791,7 +1791,7 @@ int sdhci_add_host(struct sdhci_host *host)
>  	else
>  		mmc->f_min = host->max_clk / 256;
>  	mmc->f_max = host->max_clk;
> -	mmc->caps = MMC_CAP_SDIO_IRQ;
> +	mmc->caps |= MMC_CAP_SDIO_IRQ;
>  
>  	if (!(host->quirks & SDHCI_QUIRK_FORCE_1_BIT_DATA))
>  		mmc->caps |= MMC_CAP_4_BIT_DATA;

A great shower of MMC patches have magically turned up in linux-next,
apparently via some tree of Grant's.  Those patches changed the above
code to look like:

        if (!(host->quirks & SDHCI_QUIRK_NO_SDIO_IRQ))
                mmc->caps |= MMC_CAP_SDIO_IRQ;

So it appears that this bug is fixed in that code as well.  So I'll
drop your patch.  If the above changes end up not getting merged into
mainline then your fix will be lost.

That fix was unchangelogged.  In fact the patch was completely
unchangelogged and I haven't looked at it at all and as far as I can
tell none of it has been sent to the mmc list.

Re: [PATCH 2/3] SDHCI: Don't assign mmc->caps at SDHCI directly

[Grant Likely]

On Mon, Jun 28, 2010 at 11:34 AM, Andrew Morton
<akpm@linux-foundation.org> wrote:
> On Sat, 12 Jun 2010 14:44:50 +0900
> Kyungmin Park <kyungmin.park@samsung.com> wrote:
>
>> From: Kyungmin Park <kyungmin.park@samsung.com>
>>
>> Some host controller can set mmc->caps before sdhci_add_host.
>>
>> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>> ---
>>  drivers/mmc/host/sdhci.c |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
>> index 4321e0c..142419c 100644
>> --- a/drivers/mmc/host/sdhci.c
>> +++ b/drivers/mmc/host/sdhci.c
>> @@ -1791,7 +1791,7 @@ int sdhci_add_host(struct sdhci_host *host)
>>       else
>>               mmc->f_min = host->max_clk / 256;
>>       mmc->f_max = host->max_clk;
>> -     mmc->caps = MMC_CAP_SDIO_IRQ;
>> +     mmc->caps |= MMC_CAP_SDIO_IRQ;
>>
>>       if (!(host->quirks & SDHCI_QUIRK_FORCE_1_BIT_DATA))
>>               mmc->caps |= MMC_CAP_4_BIT_DATA;
>
> A great shower of MMC patches have magically turned up in linux-next,
> apparently via some tree of Grant's.  Those patches changed the above
> code to look like:
>
>        if (!(host->quirks & SDHCI_QUIRK_NO_SDIO_IRQ))
>                mmc->caps |= MMC_CAP_SDIO_IRQ;
>
> So it appears that this bug is fixed in that code as well.  So I'll
> drop your patch.  If the above changes end up not getting merged into
> mainline then your fix will be lost.
>
> That fix was unchangelogged.  In fact the patch was completely
> unchangelogged and I haven't looked at it at all and as far as I can
> tell none of it has been sent to the mmc list.

I messed it up by pushing the wrong branch.  I'm pulling it out now
and it won't be in the next linux-next.

g.