diff --git a/mpp/hal/common/jpeg/hal_jpege_api_v2.c b/mpp/hal/common/jpeg/hal_jpege_api_v2.c
index bc3004a9..07cfe610 100644
--- a/mpp/hal/common/jpeg/hal_jpege_api_v2.c
+++ b/mpp/hal/common/jpeg/hal_jpege_api_v2.c
@@ -49,19 +49,10 @@ static MPP_RET hal_jpege_init(void *hal, MppEncHalCfg *cfg)
 
     mpp_env_get_u32("hal_jpege_debug", &hal_jpege_debug, 0);
 
-    if (vcodec_type & HAVE_RKVENC) {
-        RK_U32 hw_id = mpp_get_client_hw_id(VPU_CLIENT_RKVENC);
-        switch (hw_id) {
-        case HWID_VEPU540C : {
-            api = &hal_jpege_vepu540c;
-        } break;
-        default : {
-            mpp_err("vcodec type %08x can not find JPEG encoder device\n",
-                    vcodec_type);
-            ret = MPP_NOK;
-        } break;
-        }
-    } else if (HAVE_VEPU2 | HAVE_VEPU2_JPEG) {
+    if ((vcodec_type & HAVE_RKVENC) &&
+        (HWID_VEPU540C == mpp_get_client_hw_id(VPU_CLIENT_RKVENC))) {
+        api = &hal_jpege_vepu540c;
+    } else if (vcodec_type & (HAVE_VEPU2 | HAVE_VEPU2_JPEG)) {
         api = &hal_jpege_vepu2;
     } else if (vcodec_type & HAVE_VEPU1) {
         api = &hal_jpege_vepu1;
diff --git a/osal/mpp_soc.cpp b/osal/mpp_soc.cpp
index a697c067..b6d55d06 100644
--- a/osal/mpp_soc.cpp
+++ b/osal/mpp_soc.cpp
@@ -63,7 +63,7 @@
 #define CAP_CODING_VEPU_LITE    (HAVE_AVC|HAVE_MJPEG)
 #define CAP_CODING_VEPU22       (HAVE_HEVC)
 #define CAP_CODING_VEPU54X      (HAVE_AVC|HAVE_HEVC)
-#define CAP_CODING_VEPU540C      (HAVE_AVC|HAVE_HEVC|HAVE_MJPEG)
+#define CAP_CODING_VEPU540C     (HAVE_AVC|HAVE_HEVC|HAVE_MJPEG)
 
 static const MppDecHwCap vdpu1 = {
     .cap_coding         = CAP_CODING_VDPU,