diff options
| author |   Ilia Mirkin <imirkin@alum.mit.edu> | 2013-07-27 00:27:01 -0400 |
|---|---|---|
| committer |   Ben Skeggs <bskeggs@redhat.com> | 2013-07-30 13:04:32 +1000 |
| commit | 18f35fa6584fb28c674014674de20ed82bb84618 (patch) | |
| tree | 8aeab26ff32b24cdc19e0f473a6a73e5f7031d55 /drivers/gpu | |
| parent | drm/nv50/mc: include vp in the fb error reporting mask (diff) | |
| download | linux-dev-18f35fa6584fb28c674014674de20ed82bb84618.tar.xz linux-dev-18f35fa6584fb28c674014674de20ed82bb84618.zip | |
drm/nv31/mpeg: fix mpeg engine initialization
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c b/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c index 49ecbb859b25..9f7c7d53e61e 100644 --- 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; |