projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/asoc' into for-linus
[deliverable/linux.git]
/
drivers
/
video
/
riva
/
riva_hw.c
diff --git
a/drivers/video/riva/riva_hw.c
b/drivers/video/riva/riva_hw.c
index 70bfd78eca819a873ee35932e650bafb58d4b423..78fdbf5178d7824d181f3edcbb6e157e5e887e83 100644
(file)
--- a/
drivers/video/riva/riva_hw.c
+++ b/
drivers/video/riva/riva_hw.c
@@
-231,7
+231,7
@@
typedef struct {
int nvclk_khz;
char mem_page_miss;
char mem_latency;
int nvclk_khz;
char mem_page_miss;
char mem_latency;
-
int
memory_type;
+
u32
memory_type;
int memory_width;
char enable_video;
char gr_during_vid;
int memory_width;
char enable_video;
char gr_during_vid;
@@
-1223,6
+1223,8
@@
static int CalcVClock
}
}
}
}
}
}
+
+ /* non-zero: M/N/P/clock values assigned. zero: error (not set) */
return (DeltaOld != 0xFFFFFFFF);
}
/*
return (DeltaOld != 0xFFFFFFFF);
}
/*
@@
-1240,7
+1242,10
@@
int CalcStateExt
int dotClock
)
{
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.
*/
/*
* Save mode parameters.
*/
@@
-2102,7
+2107,7
@@
static void nv10GetConfig
)
{
struct pci_dev* dev;
)
{
struct pci_dev* dev;
-
int
amt;
+
u32
amt;
#ifdef __BIG_ENDIAN
/* turn on big endian register access */
#ifdef __BIG_ENDIAN
/* turn on big endian register access */
This page took
0.025559 seconds
and
5
git commands to generate.