diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-20 12:00:30 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-20 12:00:30 +0300 |
| commit | 35eaa42c4a1017c08d0572008db375becb621744 (patch) | |
| tree | 8185b6d18acfc63285e3132c9039c7d6c9a90527 /drivers/clk/qcom/clk-regmap-mux.c | |
| parent | 4b95391c8ef0f270ed58234597aef58976abe01c (diff) | |
| parent | a7904a538933c525096ca2ccde1e60d0ee62c08e (diff) | |
| download | linux-35eaa42c4a1017c08d0572008db375becb621744.tar.xz | |
Merge 5.16-rc6 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clk/qcom/clk-regmap-mux.c')
| -rw-r--r-- | drivers/clk/qcom/clk-regmap-mux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/qcom/clk-regmap-mux.c b/drivers/clk/qcom/clk-regmap-mux.c index b2d00b451963..45d9cca28064 100644 --- a/drivers/clk/qcom/clk-regmap-mux.c +++ b/drivers/clk/qcom/clk-regmap-mux.c @@ -28,7 +28,7 @@ static u8 mux_get_parent(struct clk_hw *hw) val &= mask; if (mux->parent_map) - return qcom_find_src_index(hw, mux->parent_map, val); + return qcom_find_cfg_index(hw, mux->parent_map, val); return val; } |