From mboxrd@z Thu Jan  1 00:00:00 1970
From: aaron.lu@intel.com (Aaron Lu)
Date: Tue, 17 Mar 2015 13:04:33 +0800
Subject: [PATCH 7/9] mmc: core: Attach PM domain prior probing of SDIO
 func driver
In-Reply-To: <1426261429-31883-8-git-send-email-ulf.hansson@linaro.org>
References: <1426261429-31883-1-git-send-email-ulf.hansson@linaro.org>
 <1426261429-31883-8-git-send-email-ulf.hansson@linaro.org>
Message-ID: <5507B5E1.6000208@intel.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On 03/13/2015 11:43 PM, Ulf Hansson wrote:
> Align the behvaior to how other buses are handling attachment of PM
> domains. Additionally, let's add error handling.
> 
> Cc: Aaron Lu <aaron.lu@intel.com>
> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

Acked-by: Aaron Lu <aaron.lu@intel.com>

> ---
> 
> For reference, this change has been discussed before.
> http://lists.infradead.org/pipermail/linux-arm-kernel/2014-October/294278.html
> 
> ---
>  drivers/mmc/core/sdio_bus.c | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
> index bee02e6..71357b8 100644
> --- a/drivers/mmc/core/sdio_bus.c
> +++ b/drivers/mmc/core/sdio_bus.c
> @@ -315,13 +315,19 @@ int sdio_add_func(struct sdio_func *func)
>  
>  	sdio_set_of_node(func);
>  	sdio_acpi_set_handle(func);
> +
> +	ret = dev_pm_domain_attach(&func->dev, false);
> +	if (ret)
> +		return ret;
> +
>  	ret = device_add(&func->dev);
> -	if (ret == 0) {
> -		sdio_func_set_present(func);
> -		dev_pm_domain_attach(&func->dev, false);
> +	if (ret) {
> +		dev_pm_domain_detach(&func->dev, false);
> +		return ret;
>  	}
>  
> -	return ret;
> +	sdio_func_set_present(func);
> +	return 0;
>  }
>  
>  /*
>