aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2017-04-14 10:25:40 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-28 08:28:17 -0400
commit6eeabd8b2b8a2a495cbdec754b9ddc9c4f811fa8 (patch)
tree44038bc750fbf340eef5253063e0d2933d5e11ae
parent8ed78a154ec463a0f72f2421b93750aef9692cab (diff)
staging: media: atomisp: fix range checking on clk_num
The range checking on clk_num is incorrect; fix these so that invalid clk_num values are detected correctly. Detected by static analysis with by PVS-Studio Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c b/drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c
index a322539d2621..f96789a31819 100644
--- a/drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c
+++ b/drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c
@@ -67,7 +67,7 @@ int vlv2_plat_set_clock_freq(int clk_num, int freq_type)
67{ 67{
68 void __iomem *addr; 68 void __iomem *addr;
69 69
70 if (clk_num < 0 && clk_num > MAX_CLK_COUNT) { 70 if (clk_num < 0 || clk_num >= MAX_CLK_COUNT) {
71 pr_err("Clock number out of range (%d)\n", clk_num); 71 pr_err("Clock number out of range (%d)\n", clk_num);
72 return -EINVAL; 72 return -EINVAL;
73 } 73 }
@@ -103,7 +103,7 @@ int vlv2_plat_get_clock_freq(int clk_num)
103{ 103{
104 u32 ret; 104 u32 ret;
105 105
106 if (clk_num < 0 && clk_num > MAX_CLK_COUNT) { 106 if (clk_num < 0 || clk_num >= MAX_CLK_COUNT) {
107 pr_err("Clock number out of range (%d)\n", clk_num); 107 pr_err("Clock number out of range (%d)\n", clk_num);
108 return -EINVAL; 108 return -EINVAL;
109 } 109 }
@@ -133,7 +133,7 @@ int vlv2_plat_configure_clock(int clk_num, u32 conf)
133{ 133{
134 void __iomem *addr; 134 void __iomem *addr;
135 135
136 if (clk_num < 0 && clk_num > MAX_CLK_COUNT) { 136 if (clk_num < 0 || clk_num >= MAX_CLK_COUNT) {
137 pr_err("Clock number out of range (%d)\n", clk_num); 137 pr_err("Clock number out of range (%d)\n", clk_num);
138 return -EINVAL; 138 return -EINVAL;
139 } 139 }
@@ -169,7 +169,7 @@ int vlv2_plat_get_clock_status(int clk_num)
169{ 169{
170 int ret; 170 int ret;
171 171
172 if (clk_num < 0 && clk_num > MAX_CLK_COUNT) { 172 if (clk_num < 0 || clk_num >= MAX_CLK_COUNT) {
173 pr_err("Clock number out of range (%d)\n", clk_num); 173 pr_err("Clock number out of range (%d)\n", clk_num);
174 return -EINVAL; 174 return -EINVAL;
175 } 175 }