From 9c7771a9855ec810901ed1e41278869f2d6c9e2a Mon Sep 17 00:00:00 2001
From: Ezequiel Garcia <elezegarcia@gmail.com>
Date: Mon, 17 Sep 2012 09:49:38 -0300
Subject: [PATCH] --- yaml --- r: 331152 b: refs/heads/master c:
 4195ec7a8fa253cb7e598a8f99f005bc97d4ac15 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/media/platform/vivi.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 585a8e1fac88..8d24a65a0025 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47054a357a788620b9ede8c678a2cec71c7155ea
+refs/heads/master: 4195ec7a8fa253cb7e598a8f99f005bc97d4ac15
diff --git a/trunk/drivers/media/platform/vivi.c b/trunk/drivers/media/platform/vivi.c
index c396da12ad89..b366b050a3dd 100644
--- a/trunk/drivers/media/platform/vivi.c
+++ b/trunk/drivers/media/platform/vivi.c
@@ -1314,7 +1314,9 @@ static int __init vivi_create_instance(int inst)
 	q->ops = &vivi_video_qops;
 	q->mem_ops = &vb2_vmalloc_memops;
 
-	vb2_queue_init(q);
+	ret = vb2_queue_init(q);
+	if (ret)
+		goto unreg_dev;
 
 	mutex_init(&dev->mutex);