diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-12-03 10:47:53 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-12-03 10:47:53 +0100 |
commit | df60673198ae678f68af54873b8904ba93fe13a0 (patch) | |
tree | 6e9a3393d0be7b68a69c2bbc58f4325ceb6fd853 /drivers/opp/of.c | |
parent | 89f579ce99f7e028e81885d3965f973c0f787611 (diff) | |
parent | 2595646791c319cadfdbf271563aac97d0843dc7 (diff) | |
download | kernel_replicant_linux-df60673198ae678f68af54873b8904ba93fe13a0.tar.gz kernel_replicant_linux-df60673198ae678f68af54873b8904ba93fe13a0.tar.bz2 kernel_replicant_linux-df60673198ae678f68af54873b8904ba93fe13a0.zip |
Merge tag 'v4.20-rc5' into x86/cleanups, to sync up the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/opp/of.c')
-rw-r--r-- | drivers/opp/of.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/opp/of.c b/drivers/opp/of.c index 5a4b47958073..38a08805a30c 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -579,10 +579,8 @@ int dev_pm_opp_of_add_table_indexed(struct device *dev, int index) */ count = of_count_phandle_with_args(dev->of_node, "operating-points-v2", NULL); - if (count != 1) - return -ENODEV; - - index = 0; + if (count == 1) + index = 0; } opp_table = dev_pm_opp_get_opp_table_indexed(dev, index); |