diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-11 18:48:25 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-11 18:48:25 -0800 |
| commit | c17a1ca14cbba5585df67544711b6d04bcc8e240 (patch) | |
| tree | 08935d5f57470bd26b8a6c6dca782cb195644eab /drivers/clk/clk-fixed-factor.c | |
| parent | 596f63da42b92863b40ea4eb29c5b40bfa3e0ef5 (diff) | |
| parent | ccda4af0f4b92f7b4c308d3acc262f4a7e3affad (diff) | |
Merge 4.20-rc2 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clk/clk-fixed-factor.c')
| -rw-r--r-- | drivers/clk/clk-fixed-factor.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c index ef0ca9414f37..ff83e899df71 100644 --- a/drivers/clk/clk-fixed-factor.c +++ b/drivers/clk/clk-fixed-factor.c @@ -210,6 +210,7 @@ static int of_fixed_factor_clk_remove(struct platform_device *pdev) { struct clk *clk = platform_get_drvdata(pdev); + of_clk_del_provider(pdev->dev.of_node); clk_unregister_fixed_factor(clk); return 0; |