diff options
author | Viresh Kumar <viresh.kumar@linaro.org> | 2015-08-17 09:50:20 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-08-28 09:43:24 -0400 |
commit | 68fa9f0ab1b61cfc7deee699da8b5b5cb12f7a58 (patch) | |
tree | b44792cf7ae63e97a58ed953f7fe5bc28ef88dfc | |
parent | 1f821ed7afaa7ed689322ee2369f270e374a6350 (diff) |
PM / OPP: Fix static checker warning (broken 64bit big endian systems)
Dan Carpenter reported (generated with static checker):
drivers/base/power/opp.c:949 _opp_add_static_v2()
warn: passing casted pointer '&new_opp->clock_latency_ns' to
'of_property_read_u32()' 64 vs 32.
This code will break on 64 bit, big endian machines.
Fix this by reading the value in a u32 type variable first and then
assigning it to the unsigned long variable.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Suggested-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | drivers/base/power/opp.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c index 4d6c4576f7ae..803d8b7ced89 100644 --- a/drivers/base/power/opp.c +++ b/drivers/base/power/opp.c | |||
@@ -918,6 +918,7 @@ static int _opp_add_static_v2(struct device *dev, struct device_node *np) | |||
918 | struct device_opp *dev_opp; | 918 | struct device_opp *dev_opp; |
919 | struct dev_pm_opp *new_opp; | 919 | struct dev_pm_opp *new_opp; |
920 | u64 rate; | 920 | u64 rate; |
921 | u32 val; | ||
921 | int ret; | 922 | int ret; |
922 | 923 | ||
923 | /* Hold our list modification lock here */ | 924 | /* Hold our list modification lock here */ |
@@ -946,14 +947,16 @@ static int _opp_add_static_v2(struct device *dev, struct device_node *np) | |||
946 | new_opp->np = np; | 947 | new_opp->np = np; |
947 | new_opp->dynamic = false; | 948 | new_opp->dynamic = false; |
948 | new_opp->available = true; | 949 | new_opp->available = true; |
949 | of_property_read_u32(np, "clock-latency-ns", | 950 | |
950 | (u32 *)&new_opp->clock_latency_ns); | 951 | if (!of_property_read_u32(np, "clock-latency-ns", &val)) |
952 | new_opp->clock_latency_ns = val; | ||
951 | 953 | ||
952 | ret = opp_get_microvolt(new_opp, dev); | 954 | ret = opp_get_microvolt(new_opp, dev); |
953 | if (ret) | 955 | if (ret) |
954 | goto free_opp; | 956 | goto free_opp; |
955 | 957 | ||
956 | of_property_read_u32(np, "opp-microamp", (u32 *)&new_opp->u_amp); | 958 | if (!of_property_read_u32(new_opp->np, "opp-microamp", &val)) |
959 | new_opp->u_amp = val; | ||
957 | 960 | ||
958 | ret = _opp_add(dev, new_opp, dev_opp); | 961 | ret = _opp_add(dev, new_opp, dev_opp); |
959 | if (ret) | 962 | if (ret) |