diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-29 12:21:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-26 17:18:30 -0700 |
| commit | d662986b4f282ed5d9e42e6dbd5e6dbb2b5e7d0b (patch) | |
| tree | 922d09dc2f43c18460f3a636fa7f1fd5b0eb54e4 /drivers/clk | |
| parent | 497587f84f16a5775b91d0a1051930ae8997d02d (diff) | |
| download | linux-3.10-d662986b4f282ed5d9e42e6dbd5e6dbb2b5e7d0b.tar.gz linux-3.10-d662986b4f282ed5d9e42e6dbd5e6dbb2b5e7d0b.tar.bz2 linux-3.10-d662986b4f282ed5d9e42e6dbd5e6dbb2b5e7d0b.zip | |
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>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/clk-wm831x.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/clk-wm831x.c b/drivers/clk/clk-wm831x.c index 16ed0680855..917a3ab482f 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) { |