This is a note to let you know that I've just added the patch titled
PM / clk: don't return int on __pm_clk_enable()
to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
pm-clk-don-t-return-int-on-__pm_clk_enable.patch
and it can be found in the queue-4.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From f4745a92781b872455f32feb01d1dce92aefcb6c Mon Sep 17 00:00:00 2001
From: Colin Ian King <[email protected]>
Date: Mon, 29 Jun 2015 22:13:38 +0100
Subject: PM / clk: don't return int on __pm_clk_enable()
From: Colin Ian King <[email protected]>
commit f4745a92781b872455f32feb01d1dce92aefcb6c upstream.
Static analysis by cppcheck found an issue that was recently introduced by
commit 471f7707b6f0b1 ("PM / clock_ops: make __pm_clk_enable more generic")
where a return status in ret was not being initialised and garbage
being returned when ce->status >= PCE_STATUS_ERROR.
The fact that ret is not being checked by the caller and that
ret is only used internally __pm_clk_enable() to check if clk_enable()
was OK means we can ignore returning it instead turn
__pm_clk_enable() into function with a void return.
Fixes: 471f7707b6f0b1 ("PM / clock_ops: make __pm_clk_enable more generic")
Signed-off-by: Colin Ian King <[email protected]>
Signed-off-by: Rafael J. Wysocki <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/base/power/clock_ops.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -38,7 +38,7 @@ struct pm_clock_entry {
* @dev: The device for the given clock
* @ce: PM clock entry corresponding to the clock.
*/
-static inline int __pm_clk_enable(struct device *dev, struct pm_clock_entry
*ce)
+static inline void __pm_clk_enable(struct device *dev, struct pm_clock_entry
*ce)
{
int ret;
@@ -50,8 +50,6 @@ static inline int __pm_clk_enable(struct
dev_err(dev, "%s: failed to enable clk %p, error %d\n",
__func__, ce->clk, ret);
}
-
- return ret;
}
/**
Patches currently in stable-queue which might be from [email protected]
are
queue-4.2/pm-clk-don-t-return-int-on-__pm_clk_enable.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
