|
@@ -264,10 +264,12 @@ static int spi_drv_probe(struct device *dev)
|
|
|
if (ret)
|
|
|
return ret;
|
|
|
|
|
|
- acpi_dev_pm_attach(dev, true);
|
|
|
- ret = sdrv->probe(to_spi_device(dev));
|
|
|
- if (ret)
|
|
|
- acpi_dev_pm_detach(dev, true);
|
|
|
+ ret = dev_pm_domain_attach(dev, true);
|
|
|
+ if (ret != -EPROBE_DEFER) {
|
|
|
+ ret = sdrv->probe(to_spi_device(dev));
|
|
|
+ if (ret)
|
|
|
+ dev_pm_domain_detach(dev, true);
|
|
|
+ }
|
|
|
|
|
|
return ret;
|
|
|
}
|
|
@@ -278,7 +280,7 @@ static int spi_drv_remove(struct device *dev)
|
|
|
int ret;
|
|
|
|
|
|
ret = sdrv->remove(to_spi_device(dev));
|
|
|
- acpi_dev_pm_detach(dev, true);
|
|
|
+ dev_pm_domain_detach(dev, true);
|
|
|
|
|
|
return ret;
|
|
|
}
|