1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_opr.c b/drivers/media/video/s5p-mfc/s5p_mfc_opr.c
index e08b21c50ebf..a8028297fc70 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_opr.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_opr.c
@@ -43,7 +43,7 @@ int s5p_mfc_alloc_dec_temp_buffers(struct s5p_mfc_ctx *ctx)
         ctx->desc_buf = vb2_dma_contig_memops.alloc(
                         dev->alloc_ctx[MFC_BANK1_ALLOC_CTX], DESC_BUF_SIZE);
         if (IS_ERR_VALUE((int)ctx->desc_buf)) {
-                ctx->desc_buf = 0;
+                ctx->desc_buf = NULL;
                 mfc_err("Allocating DESC buffer failed\n");
                 return -ENOMEM;
         }
@@ -54,7 +54,7 @@ int s5p_mfc_alloc_dec_temp_buffers(struct s5p_mfc_ctx *ctx)
         if (desc_virt == NULL) {
                 vb2_dma_contig_memops.put(ctx->desc_buf);
                 ctx->desc_phys = 0;
-                ctx->desc_buf = 0;
+                ctx->desc_buf = NULL;
                 mfc_err("Remapping DESC buffer failed\n");
                 return -ENOMEM;
         }
@@ -69,7 +69,7 @@ void s5p_mfc_release_dec_desc_buffer(struct s5p_mfc_ctx *ctx)
         if (ctx->desc_phys) {
                 vb2_dma_contig_memops.put(ctx->desc_buf);
                 ctx->desc_phys = 0;
-                ctx->desc_buf = 0;
+                ctx->desc_buf = NULL;
         }
 }
 
@@ -186,7 +186,7 @@ int s5p_mfc_alloc_codec_buffers(struct s5p_mfc_ctx *ctx)
                 ctx->bank1_buf = vb2_dma_contig_memops.alloc(
                 dev->alloc_ctx[MFC_BANK1_ALLOC_CTX], ctx->bank1_size);
                 if (IS_ERR(ctx->bank1_buf)) {
-                        ctx->bank1_buf = 0;
+                        ctx->bank1_buf = NULL;
                         printk(KERN_ERR
                                "Buf alloc for decoding failed (port A)\n");
                         return -ENOMEM;
@@ -200,7 +200,7 @@ int s5p_mfc_alloc_codec_buffers(struct s5p_mfc_ctx *ctx)
                 ctx->bank2_buf = vb2_dma_contig_memops.alloc(
                 dev->alloc_ctx[MFC_BANK2_ALLOC_CTX], ctx->bank2_size);
                 if (IS_ERR(ctx->bank2_buf)) {
-                        ctx->bank2_buf = 0;
+                        ctx->bank2_buf = NULL;
                         mfc_err("Buf alloc for decoding failed (port B)\n");
                         return -ENOMEM;
                 }
@@ -216,13 +216,13 @@ void s5p_mfc_release_codec_buffers(struct s5p_mfc_ctx *ctx)
 {
         if (ctx->bank1_buf) {
                 vb2_dma_contig_memops.put(ctx->bank1_buf);
-                ctx->bank1_buf = 0;
+                ctx->bank1_buf = NULL;
                 ctx->bank1_phys = 0;
                 ctx->bank1_size = 0;
         }
         if (ctx->bank2_buf) {
                 vb2_dma_contig_memops.put(ctx->bank2_buf);
-                ctx->bank2_buf = 0;
+                ctx->bank2_buf = NULL;
                 ctx->bank2_phys = 0;
                 ctx->bank2_size = 0;
         }
@@ -244,7 +244,7 @@ int s5p_mfc_alloc_instance_buffer(struct s5p_mfc_ctx *ctx)
         if (IS_ERR(ctx->ctx_buf)) {
                 mfc_err("Allocating context buffer failed\n");
                 ctx->ctx_phys = 0;
-                ctx->ctx_buf = 0;
+                ctx->ctx_buf = NULL;
                 return -ENOMEM;
         }
         ctx->ctx_phys = s5p_mfc_mem_cookie(
@@ -256,7 +256,7 @@ int s5p_mfc_alloc_instance_buffer(struct s5p_mfc_ctx *ctx)
                 mfc_err("Remapping instance buffer failed\n");
                 vb2_dma_contig_memops.put(ctx->ctx_buf);
                 ctx->ctx_phys = 0;
-                ctx->ctx_buf = 0;
+                ctx->ctx_buf = NULL;
                 return -ENOMEM;
         }
         /* Zero content of the allocated memory */
@@ -265,7 +265,7 @@ int s5p_mfc_alloc_instance_buffer(struct s5p_mfc_ctx *ctx)
         if (s5p_mfc_init_shm(ctx) < 0) {
                 vb2_dma_contig_memops.put(ctx->ctx_buf);
                 ctx->ctx_phys = 0;
-                ctx->ctx_buf = 0;
+                ctx->ctx_buf = NULL;
                 return -ENOMEM;
         }
         return 0;
@@ -277,12 +277,12 @@ void s5p_mfc_release_instance_buffer(struct s5p_mfc_ctx *ctx)
         if (ctx->ctx_buf) {
                 vb2_dma_contig_memops.put(ctx->ctx_buf);
                 ctx->ctx_phys = 0;
-                ctx->ctx_buf = 0;
+                ctx->ctx_buf = NULL;
         }
         if (ctx->shm_alloc) {
                 vb2_dma_contig_memops.put(ctx->shm_alloc);
-                ctx->shm_alloc = 0;
-                ctx->shm = 0;
+                ctx->shm_alloc = NULL;
+                ctx->shm = NULL;
         }
 }