On Tue 07 Jun 2011 at 21:29:25 Rafael J. Wysocki wrote:
>
> OK, below is an "official" version. Can you please double check if
> it fixes the problem for you?
Hi,
I've tested it successfully, but only the CONFIG_PM_RUNTIME=y case, not
the other because of still another McBSP issue, I believe, described
elswhere.
Thanks,
Janusz
>
> Rafael
>
> ---
> From: Rafael J. Wysocki <rjw@xxxxxxx>
> Subject: PM / Runtime: Fix loops in pm_runtime_clk_notify()
>
> The loops over connection ID strings in pm_runtime_clk_notify()
> should actually iterate over the strings and not over the elements
> of the first of them, so make those loops behave as appropriate.
>
> This fixes a regression introduced by commit 600b776eb39a13a28b090
> (OMAP1 / PM: Use generic clock manipulation routines for runtime PM).
>
> Reported-by: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
> Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
> ---
> drivers/base/power/clock_ops.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> Index: linux-2.6/drivers/base/power/clock_ops.c
> ===================================================================
> --- linux-2.6.orig/drivers/base/power/clock_ops.c
> +++ linux-2.6/drivers/base/power/clock_ops.c
> @@ -291,7 +291,7 @@ static int pm_runtime_clk_notify(struct
> {
> struct pm_clk_notifier_block *clknb;
> struct device *dev = data;
> - char *con_id;
> + char **con_id;
> int error;
>
> dev_dbg(dev, "%s() %ld\n", __func__, action);
> @@ -309,8 +309,8 @@ static int pm_runtime_clk_notify(struct
>
> dev->pwr_domain = clknb->pwr_domain;
> if (clknb->con_ids[0]) {
> - for (con_id = clknb->con_ids[0]; *con_id; con_id++)
> - pm_runtime_clk_add(dev, con_id);
> + for (con_id = clknb->con_ids; *con_id; con_id++)
> + pm_runtime_clk_add(dev, *con_id);
> } else {
> pm_runtime_clk_add(dev, NULL);
> }
> @@ -380,7 +380,7 @@ static int pm_runtime_clk_notify(struct
> {
> struct pm_clk_notifier_block *clknb;
> struct device *dev = data;
> - char *con_id;
> + char **con_id;
>
> dev_dbg(dev, "%s() %ld\n", __func__, action);
>
> @@ -389,16 +389,16 @@ static int pm_runtime_clk_notify(struct
> switch (action) {
> case BUS_NOTIFY_ADD_DEVICE:
> if (clknb->con_ids[0]) {
> - for (con_id = clknb->con_ids[0]; *con_id; con_id++)
> - enable_clock(dev, con_id);
> + for (con_id = clknb->con_ids; *con_id; con_id++)
> + enable_clock(dev, *con_id);
> } else {
> enable_clock(dev, NULL);
> }
> break;
> case BUS_NOTIFY_DEL_DEVICE:
> if (clknb->con_ids[0]) {
> - for (con_id = clknb->con_ids[0]; *con_id; con_id++)
> - disable_clock(dev, con_id);
> + for (con_id = clknb->con_ids; *con_id; con_id++)
> + disable_clock(dev, *con_id);
> } else {
> disable_clock(dev, NULL);
> }
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap"
> in the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
