tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM / Runtime: Fix loops in pm_runtime_clk_notify()
PM / Intel IOMMU: Fix init_iommu_pm_ops() for CONFIG_PM unset
+9
-9
+8
-8
drivers/base/power/clock_ops.c
+8
-8
drivers/base/power/clock_ops.c
···
291
291
{
292
292
struct pm_clk_notifier_block *clknb;
293
293
struct device *dev = data;
294
-
char *con_id;
294
+
char **con_id;
295
295
int error;
296
296
297
297
dev_dbg(dev, "%s() %ld\n", __func__, action);
···
309
309
310
310
dev->pwr_domain = clknb->pwr_domain;
311
311
if (clknb->con_ids[0]) {
312
-
for (con_id = clknb->con_ids[0]; *con_id; con_id++)
313
-
pm_runtime_clk_add(dev, con_id);
312
+
for (con_id = clknb->con_ids; *con_id; con_id++)
313
+
pm_runtime_clk_add(dev, *con_id);
314
314
} else {
315
315
pm_runtime_clk_add(dev, NULL);
316
316
}
···
380
380
{
381
381
struct pm_clk_notifier_block *clknb;
382
382
struct device *dev = data;
383
-
char *con_id;
383
+
char **con_id;
384
384
385
385
dev_dbg(dev, "%s() %ld\n", __func__, action);
386
386
···
389
389
switch (action) {
390
390
case BUS_NOTIFY_ADD_DEVICE:
391
391
if (clknb->con_ids[0]) {
392
-
for (con_id = clknb->con_ids[0]; *con_id; con_id++)
393
-
enable_clock(dev, con_id);
392
+
for (con_id = clknb->con_ids; *con_id; con_id++)
393
+
enable_clock(dev, *con_id);
394
394
} else {
395
395
enable_clock(dev, NULL);
396
396
}
397
397
break;
398
398
case BUS_NOTIFY_DEL_DEVICE:
399
399
if (clknb->con_ids[0]) {
400
-
for (con_id = clknb->con_ids[0]; *con_id; con_id++)
401
-
disable_clock(dev, con_id);
400
+
for (con_id = clknb->con_ids; *con_id; con_id++)
401
+
disable_clock(dev, *con_id);
402
402
} else {
403
403
disable_clock(dev, NULL);
404
404
}