diff --git a/camera/mm-camera-interface/mm_omx_jpeg_encoder.c b/camera/mm-camera-interface/mm_omx_jpeg_encoder.c
index 4c8e7e8..2e628bf 100644
--- a/camera/mm-camera-interface/mm_omx_jpeg_encoder.c
+++ b/camera/mm-camera-interface/mm_omx_jpeg_encoder.c
@@ -462,15 +462,6 @@
         userpreferences.preference = OMX_JPEG_PREF_SOFTWARE_ONLY;
         hw_encode = 0;
     }
-    if (encode_params->scaling_params->in2_w &&
-        encode_params->scaling_params->in2_h) {
-        if (jpegRotation) {
-            userpreferences.preference = OMX_JPEG_PREF_SOFTWARE_ONLY;
-            ALOGV("%s:Scaling and roation true: setting pref to sw\n",
-                __func__);
-            hw_encode = 0;
-        }
-    }
     mm_jpeg_encoder_get_buffer_offset(bufferoffset.width, bufferoffset.height,
                     &bufferoffset.yOffset,
                     &bufferoffset.cbcrOffset,