diff options
author | Sasha Levin <sasha.levin@oracle.com> | 2012-12-20 13:11:18 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-27 16:08:12 -0500 |
commit | 9a3323aef4e32585a76ace5f53973404e7e5afee (patch) | |
tree | 7aa841aa3ee4db8d5c0e6d9dd5311de4b74c4eae | |
parent | c84401c200423e4855bc990d8460cc0c3a2bb664 (diff) |
[media] m2m-deinterlace: use correct check for kzalloc failure
There is no point in PTR_ERR()ing a NULL pointer, use a real error
instead.
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/platform/m2m-deinterlace.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/platform/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c index ed77a645e992..6c4db9b98989 100644 --- a/drivers/media/platform/m2m-deinterlace.c +++ b/drivers/media/platform/m2m-deinterlace.c | |||
@@ -917,10 +917,8 @@ static int deinterlace_open(struct file *file) | |||
917 | ctx->xt = kzalloc(sizeof(struct dma_async_tx_descriptor) + | 917 | ctx->xt = kzalloc(sizeof(struct dma_async_tx_descriptor) + |
918 | sizeof(struct data_chunk), GFP_KERNEL); | 918 | sizeof(struct data_chunk), GFP_KERNEL); |
919 | if (!ctx->xt) { | 919 | if (!ctx->xt) { |
920 | int ret = PTR_ERR(ctx->xt); | ||
921 | |||
922 | kfree(ctx); | 920 | kfree(ctx); |
923 | return ret; | 921 | return -ENOMEM; |
924 | } | 922 | } |
925 | 923 | ||
926 | ctx->colorspace = V4L2_COLORSPACE_REC709; | 924 | ctx->colorspace = V4L2_COLORSPACE_REC709; |