diff mbox

[v3] CLK: TI: consider the fact that of_clk_get() might return an error

Message ID 20140918143327.GA4418@linutronix.de
State New
Headers show

Commit Message

Sebastian Andrzej Siewior Sept. 18, 2014, 2:33 p.m. UTC 
I "forgot" to update the dtb and the kernel crashed:
|Unable to handle kernel NULL pointer dereference at virtual address 0000002e
|PC is at __clk_get_flags+0x4/0xc
|LR is at ti_dt_clockdomains_setup+0x70/0xe8

because I did not have the clock nodes. of_clk_get() returns an error
pointer which is not checked here.

Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
 v2…v3:
    - added acked by
    - fixed "CHECK: Alignment should match open parenthesis"
    
 v1…v2:
     add "%s __func__" to the added pr_err

 drivers/clk/ti/clockdomain.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Tero Kristo Sept. 29, 2014, 8:56 a.m. UTC | #1 
On 09/18/2014 05:33 PM, Sebastian Andrzej Siewior wrote:
> I "forgot" to update the dtb and the kernel crashed:
> |Unable to handle kernel NULL pointer dereference at virtual address 0000002e
> |PC is at __clk_get_flags+0x4/0xc
> |LR is at ti_dt_clockdomains_setup+0x70/0xe8
>
> because I did not have the clock nodes. of_clk_get() returns an error
> pointer which is not checked here.
>
> Acked-by: Nishanth Menon <nm@ti.com>
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

Thanks, v3 applied to for-v3.18/ti-clk-drv.

-Tero

> ---
>   v2…v3:
>      - added acked by
>      - fixed "CHECK: Alignment should match open parenthesis"
>
>   v1…v2:
>       add "%s __func__" to the added pr_err
>
>   drivers/clk/ti/clockdomain.c | 5 +++++
>   1 file changed, 5 insertions(+)
>
> diff --git a/drivers/clk/ti/clockdomain.c b/drivers/clk/ti/clockdomain.c
> index f1e0038d76ac..b4c5faccaece 100644
> --- a/drivers/clk/ti/clockdomain.c
> +++ b/drivers/clk/ti/clockdomain.c
> @@ -36,6 +36,11 @@ static void __init of_ti_clockdomain_setup(struct device_node *node)
>
>   	for (i = 0; i < num_clks; i++) {
>   		clk = of_clk_get(node, i);
> +		if (IS_ERR(clk)) {
> +			pr_err("%s: Failed get %s' clock nr %d (%ld)\n",
> +			       __func__, node->full_name, i, PTR_ERR(clk));
> +			continue;
> +		}
>   		if (__clk_get_flags(clk) & CLK_IS_BASIC) {
>   			pr_warn("can't setup clkdm for basic clk %s\n",
>   				__clk_get_name(clk));
>
diff mbox

Patch

diff --git a/drivers/clk/ti/clockdomain.c b/drivers/clk/ti/clockdomain.c
index f1e0038d76ac..b4c5faccaece 100644
--- a/drivers/clk/ti/clockdomain.c
+++ b/drivers/clk/ti/clockdomain.c
@@ -36,6 +36,11 @@  static void __init of_ti_clockdomain_setup(struct device_node *node)
 
 	for (i = 0; i < num_clks; i++) {
 		clk = of_clk_get(node, i);
+		if (IS_ERR(clk)) {
+			pr_err("%s: Failed get %s' clock nr %d (%ld)\n",
+			       __func__, node->full_name, i, PTR_ERR(clk));
+			continue;
+		}
 		if (__clk_get_flags(clk) & CLK_IS_BASIC) {
 			pr_warn("can't setup clkdm for basic clk %s\n",
 				__clk_get_name(clk));