[PATCH 09/10] [PM-WIP-MMC] OMAP MMC : Fix crash with CONFIG_PM_RUNTIME

[PATCH 09/10] [PM-WIP-MMC] OMAP MMC : Fix crash with CONFIG_PM_RUNTIME

[kishore kadiyala]

Crash if enabled CONFIG_PM_RUNTIME and power_saving set.

Use get_sync/put_sync properly so that host->nesting_cnt gets
updated properly.

Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
---
 drivers/mmc/host/omap_hsmmc.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index c113bfd..90a69c3 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -2036,7 +2036,8 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
 	host->dpm_state = DISABLED;

 	pm_runtime_enable(host->dev);
-	pm_runtime_get_sync(host->dev);
+	if (mmc_host_enable(host->mmc) != 0)
+		goto err1;

 	if (cpu_is_omap2430()) {
 		host->dbclk = clk_get(&pdev->dev, "mmchsdb_fck");
@@ -2139,8 +2140,6 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)

 	mmc_add_host(mmc);

-	pm_runtime_put(host->dev);
-
 	if (mmc_slot(host).name != NULL) {
 		ret = device_create_file(&mmc->class_dev, &dev_attr_slot_name);
 		if (ret < 0)
-- 
1.7.0.4

Re: [PATCH 09/10] [PM-WIP-MMC] OMAP MMC : Fix crash with CONFIG_PM_RUNTIME

[Kevin Hilman]

"kishore kadiyala" <kishore.kadiyala@ti.com> writes:

> Crash if enabled CONFIG_PM_RUNTIME and power_saving set.
>
> Use get_sync/put_sync properly so that host->nesting_cnt gets
> updated properly.

<blush>This one is my fault for not really understanding the MMC driver.

Go ahead and just fold this into the original patch when you incorporate
it.

Kevin

> Cc: Kevin Hilman <khilman@deeprootsystems.com>
> Cc: Benoit Cousson <b-cousson@ti.com>
> Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
> ---
>  drivers/mmc/host/omap_hsmmc.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index c113bfd..90a69c3 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -2036,7 +2036,8 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
>  	host->dpm_state = DISABLED;
>
>  	pm_runtime_enable(host->dev);
> -	pm_runtime_get_sync(host->dev);
> +	if (mmc_host_enable(host->mmc) != 0)
> +		goto err1;
>
>  	if (cpu_is_omap2430()) {
>  		host->dbclk = clk_get(&pdev->dev, "mmchsdb_fck");
> @@ -2139,8 +2140,6 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
>
>  	mmc_add_host(mmc);
>
> -	pm_runtime_put(host->dev);
> -
>  	if (mmc_slot(host).name != NULL) {
>  		ret = device_create_file(&mmc->class_dev, &dev_attr_slot_name);
>  		if (ret < 0)

Re: [PATCH 09/10] [PM-WIP-MMC] OMAP MMC : Fix crash with CONFIG_PM_RUNTIME

[kishore kadiyala]

On Fri, Aug 27, 2010 at 4:53 AM, Kevin Hilman
<khilman@deeprootsystems.com> wrote:
> "kishore kadiyala" <kishore.kadiyala@ti.com> writes:
>
>> Crash if enabled CONFIG_PM_RUNTIME and power_saving set.
>>
>> Use get_sync/put_sync properly so that host->nesting_cnt gets
>> updated properly.
>
> <blush>This one is my fault for not really understanding the MMC driver.
>
> Go ahead and just fold this into the original patch when you incorporate
> it.

Sure , will take care in final series while posting to LO

Regards,
Kishore
>
> Kevin
>
>> Cc: Kevin Hilman <khilman@deeprootsystems.com>
>> Cc: Benoit Cousson <b-cousson@ti.com>
>> Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
>> ---
>>  drivers/mmc/host/omap_hsmmc.c |    5 ++---
>>  1 files changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
>> index c113bfd..90a69c3 100644
>> --- a/drivers/mmc/host/omap_hsmmc.c
>> +++ b/drivers/mmc/host/omap_hsmmc.c
>> @@ -2036,7 +2036,8 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
>>       host->dpm_state = DISABLED;
>>
>>       pm_runtime_enable(host->dev);
>> -     pm_runtime_get_sync(host->dev);
>> +     if (mmc_host_enable(host->mmc) != 0)
>> +             goto err1;
>>
>>       if (cpu_is_omap2430()) {
>>               host->dbclk = clk_get(&pdev->dev, "mmchsdb_fck");
>> @@ -2139,8 +2140,6 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
>>
>>       mmc_add_host(mmc);
>>
>> -     pm_runtime_put(host->dev);
>> -
>>       if (mmc_slot(host).name != NULL) {
>>               ret = device_create_file(&mmc->class_dev, &dev_attr_slot_name);
>>               if (ret < 0)
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html