From 9611846b4dcf096c85fbdb69e95fdd38475c9476 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Thu, 20 Dec 2012 15:11:18 -0300 Subject: [PATCH] --- yaml --- r: 357224 b: refs/heads/master c: 9a3323aef4e32585a76ace5f53973404e7e5afee h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/m2m-deinterlace.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 347cab8b1484..7a92cf812112 100644 --- 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 index ed77a645e992..6c4db9b98989 100644 --- 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;