aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-29 12:21:01 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-26 17:21:59 -0700
commit107bef8649a420ff3ea657afb254a094ea119494 (patch)
treeb77a9019698032fb9393148c57c4d816c8c75633
parente8247a339d36fc31b5dbf26cdea21d79f3cffa01 (diff)
downloadlinux-linaro-stable-107bef8649a420ff3ea657afb254a094ea119494.tar.gz
clk: wm831x: Initialise wm831x pointer on init
commit 08442ce993deeb15a070c14cc3f3459e87d111e0 upstream. Otherwise any attempt to interact with the hardware will crash. This is what happens when drivers get written blind. Signed-off-by: Mark Brown <broonie@linaro.org> Signed-off-by: Mike Turquette <mturquette@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/clk/clk-wm831x.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/clk-wm831x.c b/drivers/clk/clk-wm831x.c
index 1b3f8c9b98cc..1d5af3f7db62 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) {