---

yaml --- r: 357224 b: refs/heads/master c: 9a3323a h: refs/heads/master v: v3
git-mirror · Dec 27, 2012 · 9611846 · 9611846
1 parent a4d1ea3
commit 9611846
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c84401c200423e4855bc990d8460cc0c3a2bb664
+refs/heads/master: 9a3323aef4e32585a76ace5f53973404e7e5afee
diff --git a/trunk/drivers/media/platform/m2m-deinterlace.c b/trunk/drivers/media/platform/m2m-deinterlace.c
@@ -917,10 +917,8 @@ static int deinterlace_open(struct file *file)
 	ctx->xt = kzalloc(sizeof(struct dma_async_tx_descriptor) +
 				sizeof(struct data_chunk), GFP_KERNEL);
 	if (!ctx->xt) {
-		int ret = PTR_ERR(ctx->xt);
-
 		kfree(ctx);
-		return ret;
+		return -ENOMEM;
 	}
 
 	ctx->colorspace = V4L2_COLORSPACE_REC709;