summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-08-29 21:52:17 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2021-08-29 21:52:17 +0200
commit90ac80dcd3136da7c5694835d6cad2010aa08798 (patch)
tree8d24cd035b8d5411ddb660cdafacba3b47eb77f6
parentMerge tag 'sched_urgent_for_v5.14' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentclk: renesas: rcar-usb2-clock-sel: Fix kernel NULL pointer dereference (diff)
downloadlinux-90ac80dcd3136da7c5694835d6cad2010aa08798.tar.xz
linux-90ac80dcd3136da7c5694835d6cad2010aa08798.zip
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fix from Stephen Boyd: "One hotfix for a NULL pointer deref in the Renesas usb clk driver" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: renesas: rcar-usb2-clock-sel: Fix kernel NULL pointer dereference
-rw-r--r--drivers/clk/renesas/rcar-usb2-clock-sel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/renesas/rcar-usb2-clock-sel.c b/drivers/clk/renesas/rcar-usb2-clock-sel.c
index 9fb79bd79435..684d8937965e 100644
--- a/drivers/clk/renesas/rcar-usb2-clock-sel.c
+++ b/drivers/clk/renesas/rcar-usb2-clock-sel.c
@@ -187,7 +187,7 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev)
init.ops = &usb2_clock_sel_clock_ops;
priv->hw.init = &init;
- ret = devm_clk_hw_register(NULL, &priv->hw);
+ ret = devm_clk_hw_register(dev, &priv->hw);
if (ret)
goto pm_put;