diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-27 10:43:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-27 10:43:52 +0100 |
| commit | 2a0458773656240cf6fa97f1126c92dcddf8ab90 (patch) | |
| tree | 3f2efbe9c5a467bc5bcacddd6dc450200092aefd /drivers/clk | |
| parent | 4ed4d44eb2192604716226a6f0edad02ab76101f (diff) | |
| parent | cff43fc8785eb4f8b3fa5a1030890fd8cad0cbdd (diff) | |
Merge tag 'v3.10.13' into linux-linaro-lsk
This is the 3.10.13 stable release
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) { |