diff --git a/src/h264.c b/src/h264.c
index 4f5ee62..7cd48d0 100644
--- a/src/h264.c
+++ b/src/h264.c
@@ -233,7 +233,7 @@ static void h264_va_slice_to_v4l2(struct sunxi_cedrus_driver_data *driver_data,
 }
 
 int h264_set_controls(struct sunxi_cedrus_driver_data *driver_data,
-	struct object_surface *surface_object)
+		      struct object_surface *surface)
 {
 	struct v4l2_ctrl_h264_scaling_matrix matrix = { 0 };
 	struct v4l2_ctrl_h264_decode_param decode = { 0 };
@@ -242,37 +242,37 @@ int h264_set_controls(struct sunxi_cedrus_driver_data *driver_data,
 	struct v4l2_ctrl_h264_sps sps = { 0 };
 	int rc;
 
-	h264_va_picture_to_v4l2(driver_data, &surface_object->params.h264.picture,
+	h264_va_picture_to_v4l2(driver_data, &surface->params.h264.picture,
 				&decode, &pps, &sps);
-	h264_va_matrix_to_v4l2(driver_data, &surface_object->params.h264.matrix, &matrix);
-	h264_va_slice_to_v4l2(driver_data, &surface_object->params.h264.slice,
-			      &surface_object->params.h264.picture, &slice);
+	h264_va_matrix_to_v4l2(driver_data, &surface->params.h264.matrix, &matrix);
+	h264_va_slice_to_v4l2(driver_data, &surface->params.h264.slice,
+			      &surface->params.h264.picture, &slice);
 
-	rc = v4l2_set_control(driver_data->video_fd, surface_object->request_fd,
+	rc = v4l2_set_control(driver_data->video_fd, surface->request_fd,
 			      V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS,
 			      &decode, sizeof(decode));
 	if (rc < 0)
 		return VA_STATUS_ERROR_OPERATION_FAILED;
 
-	rc = v4l2_set_control(driver_data->video_fd, surface_object->request_fd,
+	rc = v4l2_set_control(driver_data->video_fd, surface->request_fd,
 			      V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS,
 			      &slice, sizeof(slice));
 	if (rc < 0)
 		return VA_STATUS_ERROR_OPERATION_FAILED;
 
-	rc = v4l2_set_control(driver_data->video_fd, surface_object->request_fd,
+	rc = v4l2_set_control(driver_data->video_fd, surface->request_fd,
 			      V4L2_CID_MPEG_VIDEO_H264_PPS,
 			      &pps, sizeof(pps));
 	if (rc < 0)
 		return VA_STATUS_ERROR_OPERATION_FAILED;
 
-	rc = v4l2_set_control(driver_data->video_fd, surface_object->request_fd,
+	rc = v4l2_set_control(driver_data->video_fd, surface->request_fd,
 			      V4L2_CID_MPEG_VIDEO_H264_SPS,
 			      &sps, sizeof(sps));
 	if (rc < 0)
 		return VA_STATUS_ERROR_OPERATION_FAILED;
 
-	rc = v4l2_set_control(driver_data->video_fd, surface_object->request_fd,
+	rc = v4l2_set_control(driver_data->video_fd, surface->request_fd,
 			      V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX,
 			      &matrix, sizeof(matrix));
 	if (rc < 0)