projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9218376
)
drm/nv31/mpeg: fix mpeg engine initialization
author
Ilia Mirkin
<imirkin@alum.mit.edu>
Sat, 27 Jul 2013 04:27:01 +0000
(
00:27
-0400)
committer
Ben Skeggs
<bskeggs@redhat.com>
Tue, 30 Jul 2013 03:04:32 +0000
(13:04 +1000)
object->engine is null, which leads to a null deref down the line
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c
b/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c
index
49ecbb8
..
9f7c7d5
100644
(file)
--- a/
drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c
+++ b/
drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c
@@
-265,8
+265,8
@@
nv31_mpeg_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
int
nv31_mpeg_init(struct nouveau_object *object)
{
- struct nouveau_engine *engine = nv_engine(object
->engine
);
- struct nv31_mpeg_priv *priv = (void *)
engine
;
+ struct nouveau_engine *engine = nv_engine(object);
+ struct nv31_mpeg_priv *priv = (void *)
object
;
struct nouveau_fb *pfb = nouveau_fb(object);
int ret, i;