projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[linux-2.6-microblaze.git]
/
drivers
/
regulator
/
helpers.c
diff --git
a/drivers/regulator/helpers.c
b/drivers/regulator/helpers.c
index
0e16e31
..
ad2237a
100644
(file)
--- a/
drivers/regulator/helpers.c
+++ b/
drivers/regulator/helpers.c
@@
-948,7
+948,7
@@
int regulator_set_ramp_delay_regmap(struct regulator_dev *rdev, int ramp_delay)
int ret;
unsigned int sel;
int ret;
unsigned int sel;
- if (
!rdev->desc->n_ramp_values
)
+ if (
WARN_ON(!rdev->desc->n_ramp_values || !rdev->desc->ramp_delay_table)
)
return -EINVAL;
ret = find_closest_bigger(ramp_delay, rdev->desc->ramp_delay_table,
return -EINVAL;
ret = find_closest_bigger(ramp_delay, rdev->desc->ramp_delay_table,