5 files changed, 17 insertions, 12 deletions

diff --git a/Documentation/driver-api/pm/devices.rst b/Documentation/driver-api/pm/devices.rst
index bedd32388dac..a0dc2879a152 100644
--- a/Documentation/driver-api/pm/devices.rst
+++ b/Documentation/driver-api/pm/devices.rst
@@ -675,7 +675,7 @@ sub-domain of the parent domain.
 
 Support for power domains is provided through the :c:member:`pm_domain` field of
 |struct device|.  This field is a pointer to an object of type
-|struct dev_pm_domain|, defined in :file:`include/linux/pm.h``, providing a set
+|struct dev_pm_domain|, defined in :file:`include/linux/pm.h`, providing a set
 of power management callbacks analogous to the subsystem-level and device driver
 callbacks that are executed for the given device during all power transitions,
 instead of the respective subsystem-level callbacks.  Specifically, if a
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index ea1732ed7a9d..770b1539a083 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -1860,10 +1860,13 @@ void device_pm_check_callbacks(struct device *dev)
 {
         spin_lock_irq(&dev->power.lock);
         dev->power.no_pm_callbacks =
-                (!dev->bus || pm_ops_is_empty(dev->bus->pm)) &&
-                (!dev->class || pm_ops_is_empty(dev->class->pm)) &&
+                (!dev->bus || (pm_ops_is_empty(dev->bus->pm) &&
+                 !dev->bus->suspend && !dev->bus->resume)) &&
+                (!dev->class || (pm_ops_is_empty(dev->class->pm) &&
+                 !dev->class->suspend && !dev->class->resume)) &&
                 (!dev->type || pm_ops_is_empty(dev->type->pm)) &&
                 (!dev->pm_domain || pm_ops_is_empty(&dev->pm_domain->ops)) &&
-                (!dev->driver || pm_ops_is_empty(dev->driver->pm));
+                (!dev->driver || (pm_ops_is_empty(dev->driver->pm) &&
+                 !dev->driver->suspend && !dev->driver->resume));
         spin_unlock_irq(&dev->power.lock);
 }
diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index f850daeffba4..277d43a83f53 100644
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@ -277,11 +277,11 @@ void dev_pm_qos_constraints_destroy(struct device *dev)
         mutex_unlock(&dev_pm_qos_sysfs_mtx);
 }
 
-static bool dev_pm_qos_invalid_request(struct device *dev,
-                                       struct dev_pm_qos_request *req)
+static bool dev_pm_qos_invalid_req_type(struct device *dev,
+                                        enum dev_pm_qos_req_type type)
 {
-        return !req || (req->type == DEV_PM_QOS_LATENCY_TOLERANCE
-                        && !dev->power.set_latency_tolerance);
+        return type == DEV_PM_QOS_LATENCY_TOLERANCE &&
+               !dev->power.set_latency_tolerance;
 }
 
 static int __dev_pm_qos_add_request(struct device *dev,
@@ -290,7 +290,7 @@ static int __dev_pm_qos_add_request(struct device *dev,
 {
         int ret = 0;
 
-        if (!dev || dev_pm_qos_invalid_request(dev, req))
+        if (!dev || !req || dev_pm_qos_invalid_req_type(dev, type))
                 return -EINVAL;
 
         if (WARN(dev_pm_qos_request_active(req),
diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c
index 7080c384ad5d..52a75053ee03 100644
--- a/drivers/cpuidle/cpuidle-arm.c
+++ b/drivers/cpuidle/cpuidle-arm.c
@@ -104,13 +104,13 @@ static int __init arm_idle_init(void)
                 ret = dt_init_idle_driver(drv, arm_idle_state_match, 1);
                 if (ret <= 0) {
                         ret = ret ? : -ENODEV;
-                        goto out_fail;
+                        goto init_fail;
                 }
 
                 ret = cpuidle_register_driver(drv);
                 if (ret) {
                         pr_err("Failed to register cpuidle driver\n");
-                        goto out_fail;
+                        goto init_fail;
                 }
 
                 /*
@@ -149,6 +149,8 @@ static int __init arm_idle_init(void)
         }
 
         return 0;
+init_fail:
+        kfree(drv);
 out_fail:
         while (--cpu >= 0) {
                 dev = per_cpu(cpuidle_devices, cpu);
diff --git a/include/linux/device.h b/include/linux/device.h
index c6f27207dbe8..1d2607923a24 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -838,7 +838,7 @@ struct dev_links_info {
  * @driver_data: Private pointer for driver specific info.
  * @links:      Links to suppliers and consumers of this device.
  * @power:      For device power management.
- *              See Documentation/power/admin-guide/devices.rst for details.
+ *              See Documentation/driver-api/pm/devices.rst for details.
  * @pm_domain:  Provide callbacks that are executed during system suspend,
  *              hibernation, system resume and during runtime PM transitions
  *              along with subsystem-level and driver-level callbacks.