diff options
| author | David S. Miller | 2012-11-25 18:49:17 +0100 |
|---|---|---|
| committer | David S. Miller | 2012-11-25 18:49:17 +0100 |
| commit | 24bc518a6888e4c97add5a5ebbff11c1ccac219f (patch) | |
| tree | d125270f4e8432cebcbc8af9079dece51dd798a0 /drivers/gpu/drm/nouveau/core/engine/graph/nv40.c | |
| parent | net/macb: GEM DMA configuration register update (diff) | |
| parent | Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/... (diff) | |
| download | kernel-qcow2-linux-24bc518a6888e4c97add5a5ebbff11c1ccac219f.tar.gz kernel-qcow2-linux-24bc518a6888e4c97add5a5ebbff11c1ccac219f.tar.xz kernel-qcow2-linux-24bc518a6888e4c97add5a5ebbff11c1ccac219f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/wireless/iwlwifi/pcie/tx.c
Minor iwlwifi conflict in TX queue disabling between 'net', which
removed a bogus warning, and 'net-next' which added some status
register poking code.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/engine/graph/nv40.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/graph/nv40.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nv40.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv40.c index 425001204a89..cc6574eeb80e 100644 --- a/drivers/gpu/drm/nouveau/core/engine/graph/nv40.c +++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv40.c @@ -346,7 +346,9 @@ nv40_graph_init(struct nouveau_object *object) return ret; /* generate and upload context program */ - nv40_grctx_init(nv_device(priv), &priv->size); + ret = nv40_grctx_init(nv_device(priv), &priv->size); + if (ret) + return ret; /* No context present currently */ nv_wr32(priv, NV40_PGRAPH_CTXCTL_CUR, 0x00000000); |