summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-29 12:21:01 +0100
committerMike Turquette <mturquette@linaro.org>2013-08-30 11:57:53 -0700
commit08442ce993deeb15a070c14cc3f3459e87d111e0 (patch)
treed2a961260fba9f0ea9429b800a019a6c62eef926
parent0044cbcd667520fedbd96d07c20cfe5b7473f71a (diff)
downloadtalos-obmc-linux-08442ce993deeb15a070c14cc3f3459e87d111e0.tar.gz
talos-obmc-linux-08442ce993deeb15a070c14cc3f3459e87d111e0.zip
clk: wm831x: Initialise wm831x pointer on init
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> Cc: stable@vger.kernel.org Signed-off-by: Mike Turquette <mturquette@linaro.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 c370ecb6b685..805b4c344006 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) {
OpenPOWER on IntegriCloud