clk: wm831x: Initialise wm831x pointer on init

Commit Message

Mark Brown Aug. 29, 2013, 11:21 a.m. UTC

From: Mark Brown <[e-mail]>

Otherwise any attempt to interact with the hardware will crash. This is
what happens when drivers get written blind.

Signed-off-by: Mark Brown <[e-mail]>
Cc: [e-mail]
---
 drivers/clk/clk-wm831x.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Mike Turquette Aug. 30, 2013, 7:39 p.m. UTC | #1

Quoting Mark Brown (2013-08-29 04:21:01)
> From: Mark Brown <[e-mail]>
> 
> Otherwise any attempt to interact with the hardware will crash. This is
> what happens when drivers get written blind.

Taken into clk-next.

Regards,
Mike

> 
> Signed-off-by: Mark Brown <[e-mail]>
> Cc: [e-mail]
> ---
>  drivers/clk/clk-wm831x.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/clk/clk-wm831x.c b/drivers/clk/clk-wm831x.c
> index 1b3f8c9..1d5af3f 100644
> --- a/drivers/clk/clk-wm831x.c
> +++ b/drivers/clk/clk-wm831x.c
> @@ -360,6 +360,8 @@ static int wm831x_clk_probe(struct platform_device *pdev)
>         if (!clkdata)
>                 return -ENOMEM;
>  
> +       clkdata->wm831x = wm831x;
> +
>         /* XTAL_ENA can only be set via OTP/InstantConfig so just read once */
>         ret = wm831x_reg_read(wm831x, WM831X_CLOCK_CONTROL_2);
>         if (ret < 0) {
> -- 
> 1.8.4.rc3

Patch

diff --git a/drivers/clk/clk-wm831x.c b/drivers/clk/clk-wm831x.c
index 1b3f8c9..1d5af3f 100644
--- a/drivers/clk/clk-wm831x.c
+++ b/drivers/clk/clk-wm831x.c
@@ -360,6 +360,8 @@  static int wm831x_clk_probe(struct platform_device *pdev)
 	if (!clkdata)
 		return -ENOMEM;
 
+	clkdata->wm831x = wm831x;
+
 	/* XTAL_ENA can only be set via OTP/InstantConfig so just read once */
 	ret = wm831x_reg_read(wm831x, WM831X_CLOCK_CONTROL_2);
 	if (ret < 0) {