Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[~andy/linux] / drivers / media / platform / m2m-deinterlace.c

diff --git a/drivers/media/platform/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c
index 05c560f2ef062c8f21ba44a943fe004942de0e81..6c4db9b989899bff0314dc0f031a219ab8f7180d 100644 (file)
--- a/drivers/media/platform/m2m-deinterlace.c
+++ b/drivers/media/platform/m2m-deinterlace.c
@@ -28,7 +28,7 @@ MODULE_AUTHOR("Javier Martin <javier.martin@vista-silicon.com");
 MODULE_LICENSE("GPL");
 MODULE_VERSION("0.0.1");
 
-static bool debug = true;
+static bool debug;
 module_param(debug, bool, 0644);
 
 /* Flags that indicate a format can be used for capture/output */
@@ -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;