From 760668a4955c5f3acf1f9e7328e9e2a0eeadc508 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 4 Jan 2012 10:20:47 +0300 Subject: [PATCH] --- yaml --- r: 287149 b: refs/heads/master c: a9d993882008a1ae2c953064f0c2ca7e604b1333 h: refs/heads/master i: 287147: 6ed7c252b084dd1c47c853a305823c8f2833ab1c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_pm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1609d15d0f54..4365ba4e2b8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 525895ba388c949aa906f26e3ec5cb1ab041f56b +refs/heads/master: a9d993882008a1ae2c953064f0c2ca7e604b1333 diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_pm.c b/trunk/drivers/gpu/drm/nouveau/nv50_pm.c index 03937212e9d8..ec5481dfcd82 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv50_pm.c +++ b/trunk/drivers/gpu/drm/nouveau/nv50_pm.c @@ -495,9 +495,9 @@ nv50_pm_clocks_pre(struct drm_device *dev, struct nouveau_pm_level *perflvl) struct drm_nouveau_private *dev_priv = dev->dev_private; struct nv50_pm_state *info; struct pll_lims pll; - int ret = -EINVAL; + int clk, ret = -EINVAL; int N, M, P1, P2; - u32 clk, out; + u32 out; if (dev_priv->chipset == 0xaa || dev_priv->chipset == 0xac)