diff options
| author | Borislav Petkov <bp@suse.de> | 2020-12-01 18:22:55 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-12-01 18:22:55 +0100 |
| commit | 15936ca13dac032a3f4e6b4ba78add3880bddcf3 (patch) | |
| tree | b56c7a5c75b25e5d91a09c9f1875cae4e50198ba /drivers/opp/of.c | |
| parent | 4a24d80b8c3e9f89d6a6a7b89bd057c463b638d3 (diff) | |
| parent | b65054597872ce3aefbc6a666385eabdf9e288da (diff) | |
Merge tag 'v5.10-rc6' into ras/core
Merge the -rc6 tag to pick up dependent changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'drivers/opp/of.c')
| -rw-r--r-- | drivers/opp/of.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/opp/of.c b/drivers/opp/of.c index 874b58756220..9faeb83e4b32 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -944,6 +944,8 @@ static int _of_add_opp_table_v1(struct device *dev, struct opp_table *opp_table) nr -= 2; } + return 0; + remove_static_opp: _opp_remove_all_static(opp_table); |