| Message ID | 1426261429-31883-8-git-send-email-ulf.hansson@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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; > } > > /* >
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; } /*
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> --- 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(-)