1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_intr.c b/drivers/media/platform/s5p-mfc/s5p_mfc_intr.c
index 37860e299021..5b8f0e085e6d 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_intr.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_intr.c
@@ -17,7 +17,6 @@
 #include <linux/io.h>
 #include <linux/sched.h>
 #include <linux/wait.h>
-#include "regs-mfc.h"
 #include "s5p_mfc_common.h"
 #include "s5p_mfc_debug.h"
 #include "s5p_mfc_intr.h"
@@ -28,7 +27,7 @@ int s5p_mfc_wait_for_done_dev(struct s5p_mfc_dev *dev, int command)
 
         ret = wait_event_interruptible_timeout(dev->queue,
                 (dev->int_cond && (dev->int_type == command
-                || dev->int_type == S5P_FIMV_R2H_CMD_ERR_RET)),
+                || dev->int_type == S5P_MFC_R2H_CMD_ERR_RET)),
                 msecs_to_jiffies(MFC_INT_TIMEOUT));
         if (ret == 0) {
                 mfc_err("Interrupt (dev->int_type:%d, command:%d) timed out\n",
@@ -40,7 +39,7 @@ int s5p_mfc_wait_for_done_dev(struct s5p_mfc_dev *dev, int command)
         }
         mfc_debug(1, "Finished waiting (dev->int_type:%d, command: %d)\n",
                                                         dev->int_type, command);
-        if (dev->int_type == S5P_FIMV_R2H_CMD_ERR_RET)
+        if (dev->int_type == S5P_MFC_R2H_CMD_ERR_RET)
                 return 1;
         return 0;
 }
@@ -60,12 +59,12 @@ int s5p_mfc_wait_for_done_ctx(struct s5p_mfc_ctx *ctx,
         if (interrupt) {
                 ret = wait_event_interruptible_timeout(ctx->queue,
                                 (ctx->int_cond && (ctx->int_type == command
-                        || ctx->int_type == S5P_FIMV_R2H_CMD_ERR_RET)),
+                        || ctx->int_type == S5P_MFC_R2H_CMD_ERR_RET)),
                                         msecs_to_jiffies(MFC_INT_TIMEOUT));
         } else {
                 ret = wait_event_timeout(ctx->queue,
                                 (ctx->int_cond && (ctx->int_type == command
-                        || ctx->int_type == S5P_FIMV_R2H_CMD_ERR_RET)),
+                        || ctx->int_type == S5P_MFC_R2H_CMD_ERR_RET)),
                                         msecs_to_jiffies(MFC_INT_TIMEOUT));
         }
         if (ret == 0) {
@@ -78,7 +77,7 @@ int s5p_mfc_wait_for_done_ctx(struct s5p_mfc_ctx *ctx,
         }
         mfc_debug(1, "Finished waiting (ctx->int_type:%d, command: %d)\n",
                                                         ctx->int_type, command);
-        if (ctx->int_type == S5P_FIMV_R2H_CMD_ERR_RET)
+        if (ctx->int_type == S5P_MFC_R2H_CMD_ERR_RET)
                 return 1;
         return 0;
 }