Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06e86849 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 13e12d14 3b3eca31

drivers/base/power/clock_ops.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -291,7 +291,7 @@ static int pm_runtime_clk_notify(struct notifier_block *nb, 
{

{

	struct pm_clk_notifier_block *clknb;

	struct pm_clk_notifier_block *clknb;

	struct device *dev = data;

	struct device *dev = data;

	char *con_id;

	char **con_id;

	int error;

	int error;





	dev_dbg(dev, "%s() %ld\n", __func__, action);

	dev_dbg(dev, "%s() %ld\n", __func__, action);
@@ -309,8 +309,8 @@ static int pm_runtime_clk_notify(struct notifier_block *nb, 




		dev->pwr_domain = clknb->pwr_domain;

		dev->pwr_domain = clknb->pwr_domain;

		if (clknb->con_ids[0]) {

		if (clknb->con_ids[0]) {

			for (con_id = clknb->con_ids[0]; *con_id; con_id++)

			for (con_id = clknb->con_ids; *con_id; con_id++)

				pm_runtime_clk_add(dev, con_id);

				pm_runtime_clk_add(dev, *con_id);

		} else {

		} else {

			pm_runtime_clk_add(dev, NULL);

			pm_runtime_clk_add(dev, NULL);

		}

		}
@@ -380,7 +380,7 @@ static int pm_runtime_clk_notify(struct notifier_block *nb, 
{

{

	struct pm_clk_notifier_block *clknb;

	struct pm_clk_notifier_block *clknb;

	struct device *dev = data;

	struct device *dev = data;

	char *con_id;

	char **con_id;





	dev_dbg(dev, "%s() %ld\n", __func__, action);

	dev_dbg(dev, "%s() %ld\n", __func__, action);
@@ -389,16 +389,16 @@ static int pm_runtime_clk_notify(struct notifier_block *nb, 
	switch (action) {

	switch (action) {

	case BUS_NOTIFY_ADD_DEVICE:

	case BUS_NOTIFY_ADD_DEVICE:

		if (clknb->con_ids[0]) {

		if (clknb->con_ids[0]) {

			for (con_id = clknb->con_ids[0]; *con_id; con_id++)

			for (con_id = clknb->con_ids; *con_id; con_id++)

				enable_clock(dev, con_id);

				enable_clock(dev, *con_id);

		} else {

		} else {

			enable_clock(dev, NULL);

			enable_clock(dev, NULL);

		}

		}

		break;

		break;

	case BUS_NOTIFY_DEL_DEVICE:

	case BUS_NOTIFY_DEL_DEVICE:

		if (clknb->con_ids[0]) {

		if (clknb->con_ids[0]) {

			for (con_id = clknb->con_ids[0]; *con_id; con_id++)

			for (con_id = clknb->con_ids; *con_id; con_id++)

				disable_clock(dev, con_id);

				disable_clock(dev, *con_id);

		} else {

		} else {

			disable_clock(dev, NULL);

			disable_clock(dev, NULL);

		}

		}

drivers/pci/intel-iommu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3388,7 +3388,7 @@ static void __init init_iommu_pm_ops(void) 
}

}





#else

#else

static inline int init_iommu_pm_ops(void) { }

static inline void init_iommu_pm_ops(void) {}

#endif	/* CONFIG_PM */

#endif	/* CONFIG_PM */





/*

/*