Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'pm-6.14-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki:
"Fix a recently introduced kernel crash due to a NULL pointer
dereference during system-wide suspend (Rafael Wysocki)"
* tag 'pm-6.14-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM: sleep: core: Restrict power.set_active propagation
+9
-12
+9
-12
drivers/base/power/main.c
+9
-12
drivers/base/power/main.c
···
1191
1191
return PMSG_ON;
1192
1192
}
1193
1193
1194
-
static void dpm_superior_set_must_resume(struct device *dev, bool set_active)
1194
+
static void dpm_superior_set_must_resume(struct device *dev)
1195
1195
{
1196
1196
struct device_link *link;
1197
1197
int idx;
1198
1198
1199
-
if (dev->parent) {
1199
+
if (dev->parent)
1200
1200
dev->parent->power.must_resume = true;
1201
-
if (set_active)
1202
-
dev->parent->power.set_active = true;
1203
-
}
1204
1201
1205
1202
idx = device_links_read_lock();
1206
1203
1207
-
list_for_each_entry_rcu_locked(link, &dev->links.suppliers, c_node) {
1204
+
list_for_each_entry_rcu_locked(link, &dev->links.suppliers, c_node)
1208
1205
link->supplier->power.must_resume = true;
1209
-
if (set_active)
1210
-
link->supplier->power.set_active = true;
1211
-
}
1212
1206
1213
1207
device_links_read_unlock(idx);
1214
1208
}
···
1281
1287
dev->power.must_resume = true;
1282
1288
1283
1289
if (dev->power.must_resume) {
1284
-
dev->power.set_active = dev->power.set_active ||
1285
-
dev_pm_test_driver_flags(dev, DPM_FLAG_SMART_SUSPEND);
1286
-
dpm_superior_set_must_resume(dev, dev->power.set_active);
1290
+
if (dev_pm_test_driver_flags(dev, DPM_FLAG_SMART_SUSPEND)) {
1291
+
dev->power.set_active = true;
1292
+
if (dev->parent && !dev->parent->power.ignore_children)
1293
+
dev->parent->power.set_active = true;
1294
+
}
1295
+
dpm_superior_set_must_resume(dev);
1287
1296
}
1288
1297
1289
1298
Complete: