diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-30 11:04:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-30 11:04:14 +0100 |
| commit | c79c33af8f867e57ad4b84102db7901aee67485a (patch) | |
| tree | aa619736b89a143cfc48f9647493c929523a928a /drivers/gpu/drm/nouveau/nv40_pm.c | |
| parent | 1c9a341bbdc14051a4d8c74ea67269786c7d3736 (diff) | |
| parent | 824ef826f3c4d83d1925a5e351313bfd3e5ca6cb (diff) | |
| download | linux-next-c79c33af8f867e57ad4b84102db7901aee67485a.tar.gz linux-next-c79c33af8f867e57ad4b84102db7901aee67485a.zip | |
Merge remote-tracking branch 'asoc/topic/core' into tmp
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv40_pm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv40_pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv40_pm.c b/drivers/gpu/drm/nouveau/nv40_pm.c index 3af5bcd0b203..625f80d53dc2 100644 --- a/drivers/gpu/drm/nouveau/nv40_pm.c +++ b/drivers/gpu/drm/nouveau/nv40_pm.c @@ -131,7 +131,7 @@ nv40_calc_pll(struct drm_device *dev, u32 reg, struct nvbios_pll *pll, if (clk < pll->vco1.max_freq) pll->vco2.max_freq = 0; - pclk->pll_calc(pclk, pll, clk, &coef); + ret = pclk->pll_calc(pclk, pll, clk, &coef); if (ret == 0) return -ERANGE; |