Skip to content

Commit 39e77c4

Browse files
committed
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd: "Some hot fixes for clk driver patches merged last week and one oops fix: - Fix license on recent MediaTek drivers - Initialize a variable before use in the new Visconti driver - Avoid an oops by unregistering the clk provider in si5341" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: mediatek: relicense mt7986 clock driver to GPL-2.0 clk: visconti: Fix uninitialized variable in printk clk: si5341: Fix clock HW provider cleanup
2 parents 4141a5e + b4966a7 commit 39e77c4

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

drivers/clk/clk-si5341.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1740,7 +1740,7 @@ static int si5341_probe(struct i2c_client *client,
17401740
clk_prepare(data->clk[i].hw.clk);
17411741
}
17421742

1743-
err = of_clk_add_hw_provider(client->dev.of_node, of_clk_si5341_get,
1743+
err = devm_of_clk_add_hw_provider(&client->dev, of_clk_si5341_get,
17441744
data);
17451745
if (err) {
17461746
dev_err(&client->dev, "unable to add clk provider\n");

drivers/clk/mediatek/clk-mt7986-apmixed.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: GPL-1.0
1+
// SPDX-License-Identifier: GPL-2.0
22
/*
33
* Copyright (c) 2021 MediaTek Inc.
44
* Author: Sam Shih <[email protected]>

drivers/clk/mediatek/clk-mt7986-infracfg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: GPL-1.0
1+
// SPDX-License-Identifier: GPL-2.0
22
/*
33
* Copyright (c) 2021 MediaTek Inc.
44
* Author: Sam Shih <[email protected]>

drivers/clk/mediatek/clk-mt7986-topckgen.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: GPL-1.0
1+
// SPDX-License-Identifier: GPL-2.0
22
/*
33
* Copyright (c) 2021 MediaTek Inc.
44
* Author: Sam Shih <[email protected]>

drivers/clk/visconti/pll.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@ static struct clk_hw *visconti_register_pll(struct visconti_pll_provider *ctx,
246246
{
247247
struct clk_init_data init;
248248
struct visconti_pll *pll;
249-
struct clk *pll_clk;
250249
struct clk_hw *pll_hw_clk;
251250
size_t len;
252251
int ret;
@@ -277,7 +276,7 @@ static struct clk_hw *visconti_register_pll(struct visconti_pll_provider *ctx,
277276
pll_hw_clk = &pll->hw;
278277
ret = clk_hw_register(NULL, &pll->hw);
279278
if (ret) {
280-
pr_err("failed to register pll clock %s : %ld\n", name, PTR_ERR(pll_clk));
279+
pr_err("failed to register pll clock %s : %d\n", name, ret);
281280
kfree(pll);
282281
pll_hw_clk = ERR_PTR(ret);
283282
}

0 commit comments

Comments
 (0)