git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_perf.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_perf.c
b/drivers/gpu/drm/nouveau/nouveau_perf.c
index
9f178aa
..
33d03fb
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_perf.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_perf.c
@@
-239,7
+239,7
@@
nouveau_perf_init(struct drm_device *dev)
if(version == 0x15) {
memtimings->timing =
kcalloc(entries, sizeof(*memtimings->timing), GFP_KERNEL);
- if
(!memtimings
) {
+ if
(!memtimings->timing
) {
NV_WARN(dev,"Could not allocate memtiming table\n");
return;
}