diff options
| author | Olof Johansson <olof@lixom.net> | 2019-09-29 11:19:18 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-09-29 11:20:41 -0700 |
| commit | a4207a1c5edc3112b3538769024c7b2ad42b9fe9 (patch) | |
| tree | 739b56fe8aba751719cb7c19f528ce2bd0093f24 /drivers/clk/clk-scmi.c | |
| parent | b74d957f6317e60924d0d3c0c01750814c24611b (diff) | |
| parent | 61423712dbb86e02af4aa5de65b9041493c92cac (diff) | |
Merge tag 'scmi-fixes-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes
ARM SCMI fixes for v5.4
Couple of fixes: one in scmi reset driver initialising missed scmi handle
and an other in scmi reset API implementation fixing the assignment of
reset state
* tag 'scmi-fixes-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
reset: reset-scmi: add missing handle initialisation
firmware: arm_scmi: reset: fix reset_state assignment in scmi_domain_reset
Link: https://lore.kernel.org/r/20190918142139.GA4370@bogus
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/clk/clk-scmi.c')
| -rw-r--r-- | drivers/clk/clk-scmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk-scmi.c b/drivers/clk/clk-scmi.c index a2287c770d5c..886f7c5df51a 100644 --- a/drivers/clk/clk-scmi.c +++ b/drivers/clk/clk-scmi.c @@ -69,7 +69,7 @@ static int scmi_clk_set_rate(struct clk_hw *hw, unsigned long rate, { struct scmi_clk *clk = to_scmi_clk(hw); - return clk->handle->clk_ops->rate_set(clk->handle, clk->id, 0, rate); + return clk->handle->clk_ops->rate_set(clk->handle, clk->id, rate); } static int scmi_clk_enable(struct clk_hw *hw) |