diff options
author | Rhyland Klein <rklein@nvidia.com> | 2016-05-12 13:45:04 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2016-06-30 02:44:23 -0400 |
commit | 82d8eb40bab10082050be945c8e7096df8e9f989 (patch) | |
tree | 0a0b68bfa650639b0764d756e4dac07eb7c5523d /drivers/mfd | |
parent | 9278e707f4e187df2b4d9eeb2bc78a1724fbe4ac (diff) |
mfd: max77620: Fix FPS switch statements
When configuring FPS during probe, assuming a DT node is present for
FPS, the code can run into a problem with the switch statements in
max77620_config_fps() and max77620_get_fps_period_reg_value(). Namely,
in the case of chip->chip_id == MAX77620, it will set
fps_[mix|max]_period but then fall through to the default switch case
and return -EINVAL. Returning this from max77620_config_fps() will
cause probe to fail.
Signed-off-by: Rhyland Klein <rklein@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Tested-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/max77620.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/max77620.c b/drivers/mfd/max77620.c index 199d261990be..f32fbb8e8129 100644 --- a/drivers/mfd/max77620.c +++ b/drivers/mfd/max77620.c | |||
@@ -203,6 +203,7 @@ static int max77620_get_fps_period_reg_value(struct max77620_chip *chip, | |||
203 | break; | 203 | break; |
204 | case MAX77620: | 204 | case MAX77620: |
205 | fps_min_period = MAX77620_FPS_PERIOD_MIN_US; | 205 | fps_min_period = MAX77620_FPS_PERIOD_MIN_US; |
206 | break; | ||
206 | default: | 207 | default: |
207 | return -EINVAL; | 208 | return -EINVAL; |
208 | } | 209 | } |
@@ -236,6 +237,7 @@ static int max77620_config_fps(struct max77620_chip *chip, | |||
236 | break; | 237 | break; |
237 | case MAX77620: | 238 | case MAX77620: |
238 | fps_max_period = MAX77620_FPS_PERIOD_MAX_US; | 239 | fps_max_period = MAX77620_FPS_PERIOD_MAX_US; |
240 | break; | ||
239 | default: | 241 | default: |
240 | return -EINVAL; | 242 | return -EINVAL; |
241 | } | 243 | } |