commit da7c74ea2b0e218ddd6c3d01ea55a12104e7c6fd
author Ben Skeggs <bskeggs@redhat.com> Tue Aug 12 23:11:18 2014 +1000
committer Ben Skeggs <bskeggs@redhat.com> Fri Aug 15 07:58:39 2014 +1000
tree c632b9ace679b0e2aeeb26434769eea68f2f14f9
parent ef07ceae02271ac6eadc9f5cd652bb7162455a1b

drm/gf100-/gr: fix -ENOSPC detection when allocating zbc table entries

Spotted by Coverity.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
index db19191..30fd1dc 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
@@ -68,6 +68,9 @@
 		}
 	}
 
+	if (zbc < 0)
+		return zbc;
+
 	memcpy(priv->zbc_color[zbc].ds, ds, sizeof(priv->zbc_color[zbc].ds));
 	memcpy(priv->zbc_color[zbc].l2, l2, sizeof(priv->zbc_color[zbc].l2));
 	priv->zbc_color[zbc].format = format;
@@ -109,6 +112,9 @@
 		}
 	}
 
+	if (zbc < 0)
+		return zbc;
+
 	priv->zbc_depth[zbc].format = format;
 	priv->zbc_depth[zbc].ds = ds;
 	priv->zbc_depth[zbc].l2 = l2;