---

yaml --- r: 335880 b: refs/heads/master c: bf7e438 h: refs/heads/master v: v3
git-mirror · Nov 18, 2012 · a8c6915 · a8c6915
1 parent ff1a410
commit a8c6915
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f150b3e7a722ebfc68eec5d83a9fe1ee8d75d71
+refs/heads/master: bf7e438bcaff4b732f86bb2eb48fc4fee04dc31b
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_abi16.c b/trunk/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -241,6 +241,10 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)
 
 	if (unlikely(!abi16))
 		return -ENOMEM;
+
+	if (!drm->channel)
+		return nouveau_abi16_put(abi16, -ENODEV);
+
 	client = nv_client(abi16->client);
 
 	if (init->fb_ctxdma_handle == ~0 || init->tt_ctxdma_handle == ~0)