summaryrefslogtreecommitdiff
path: root/drivers/video/riva/riva_hw.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-18 02:19:06 +0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-18 02:19:06 +0400
commitb8c638acacfe32c0bde361916467af00691f1965 (patch)
treea5655f484fa731d5ffd49c284f0372c4e055d144 /drivers/video/riva/riva_hw.c
parentef9efe43f2eddabee1e78a90c7c8451505bf05e1 (diff)
parent8e1c091cccd551557d24ce845715e8ceb6c49d36 (diff)
downloadlinux-b8c638acacfe32c0bde361916467af00691f1965.tar.xz
Merge branch 'uninit-var' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'uninit-var' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6: arch/i386/* fs/* ipc/*: mark variables with uninitialized_var() drivers/*: mark variables with uninitialized_var()
Diffstat (limited to 'drivers/video/riva/riva_hw.c')
-rw-r--r--drivers/video/riva/riva_hw.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/video/riva/riva_hw.c b/drivers/video/riva/riva_hw.c
index 70bfd78eca81..13307703a9f0 100644
--- a/drivers/video/riva/riva_hw.c
+++ b/drivers/video/riva/riva_hw.c
@@ -1223,6 +1223,8 @@ static int CalcVClock
}
}
}
+
+ /* non-zero: M/N/P/clock values assigned. zero: error (not set) */
return (DeltaOld != 0xFFFFFFFF);
}
/*
@@ -1240,7 +1242,10 @@ int CalcStateExt
int dotClock
)
{
- int pixelDepth, VClk, m, n, p;
+ int pixelDepth;
+ int uninitialized_var(VClk),uninitialized_var(m),
+ uninitialized_var(n), uninitialized_var(p);
+
/*
* Save mode parameters.
*/