summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-10-12 13:01:05 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-10-12 13:01:05 +0200
commit0d2f2f4f27694a2214701e7482ab7599ce4e5e77 (patch)
treecab5444c9203667e74a46d3f57a8c837e6a223b0 /include/linux
parenta10e06965ed31322cc37060321dcb31fde2d4e85 (diff)
parentd997d33eb340e2add100eac1222e107cc1396e76 (diff)
Merge v6.16.12
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/device.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index 4940db137fff..94bbdef14088 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -851,6 +851,9 @@ static inline bool device_pm_not_required(struct device *dev)
static inline void device_set_pm_not_required(struct device *dev)
{
dev->power.no_pm = true;
+#ifdef CONFIG_PM
+ dev->power.no_callbacks = true;
+#endif
}
static inline void dev_pm_syscore_device(struct device *dev, bool val)