diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-06-04 10:40:33 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-06-04 10:40:33 +0200 |
| commit | 5b550c92d704ad4b5f1081c62d515a137d1c4bd2 (patch) | |
| tree | 16673522bc7fc5dfdb4502395191548599c0d86a /drivers/mmc | |
| parent | f1c7d00c15314c9e51a7b6ed51b5b23b384e2341 (diff) | |
| parent | 49072f97d4a3f8f44fe9677e3df94082b29b7e6f (diff) | |
| download | lwn-5b550c92d704ad4b5f1081c62d515a137d1c4bd2.tar.gz lwn-5b550c92d704ad4b5f1081c62d515a137d1c4bd2.zip | |
Merge branch 'pm-domains'
* pm-domains:
PM / domains: Improve wording of dev_pm_domain_attach() comment
PM / Domains: Don't return -EEXIST at attach when PM domain exists
spi: Respect all error codes from dev_pm_domain_attach()
soundwire: Respect all error codes from dev_pm_domain_attach()
mmc: sdio: Respect all error codes from dev_pm_domain_attach()
i2c: Respect all error codes from dev_pm_domain_attach()
driver core: Respect all error codes from dev_pm_domain_attach()
amba: Respect all error codes from dev_pm_domain_attach()
PM / Domains: Allow a better error handling of dev_pm_domain_attach()
PM / Domains: Check for existing PM domain in dev_pm_domain_attach()
PM / Domains: Drop redundant code in genpd while attaching devices
PM / Domains: Drop comment in genpd about legacy Samsung DT binding
PM / Domains: Fix error path during attach in genpd
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/sdio_bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c index 2b32b88949ba..b6d8203e46eb 100644 --- a/drivers/mmc/core/sdio_bus.c +++ b/drivers/mmc/core/sdio_bus.c @@ -139,7 +139,7 @@ static int sdio_bus_probe(struct device *dev) return -ENODEV; ret = dev_pm_domain_attach(dev, false); - if (ret == -EPROBE_DEFER) + if (ret) return ret; /* Unbound SDIO functions are always suspended. |