smdk4412: camera: fix for clang/N

Change-Id: Iec747e966c1ce1380aa4ad70871886a71c6bed76
CustomROMs · Oct 28, 2016 · e452cc6 · e452cc6
1 parent 914ea63
commit e452cc6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/camera/exynos_camera.c b/camera/exynos_camera.c
@@ -2201,7 +2201,7 @@ void exynos_camera_capture_stop(struct exynos_camera *exynos_camera)
 		exynos_camera->capture_jpeg_buffer = NULL;
 	}
 
-	if (&exynos_camera->exif.enabled)
+	if (exynos_camera->exif.enabled)
 		exynos_exif_stop(exynos_camera, &exynos_camera->exif);
 
 	exynos_camera->capture_enabled = 0;
@@ -2369,7 +2369,7 @@ int exynos_camera_preview(struct exynos_camera *exynos_camera)
 			ALOGE("%s: Error in dequeueing buffer", __func__);
 			goto error;
 		}
-		ret = exynos_camera->gralloc->lock(exynos_camera->gralloc, *window_buffer, GRALLOC_USAGE_YUV_ADDR | GRALLOC_USAGE_SW_WRITE_OFTEN, 0, 0, width, height, &window_data);
+		ret = exynos_camera->gralloc->lock(exynos_camera->gralloc, *window_buffer, GRALLOC_USAGE_SW_WRITE_OFTEN, 0, 0, width, height, &window_data);
 
 		if (window_data == NULL || ret == -EINVAL) {
 			ALOGE("%s: Unable to lock gralloc", __func__);
@@ -3485,7 +3485,7 @@ int exynos_camera_recording_enabled(struct camera_device *dev)
 }
 
 void exynos_camera_release_recording_frame(struct camera_device *dev,
-	const void *opaque)
+	const void __unused *opaque)
 {
 	struct exynos_camera *exynos_camera;
 

diff --git a/camera/exynos_exif.c b/camera/exynos_exif.c
@@ -163,9 +163,9 @@ int exynos_exif_attributes_create_gps(struct exynos_camera *exynos_camera,
 		attributes->gps_altitude_ref = 1;
 
 
-	gps_latitude_abs = fabs(gps_latitude);
-	gps_longitude_abs = fabs(gps_longitude);
-	gps_altitude_abs = fabs(gps_altitude);
+	gps_latitude_abs = labs(gps_latitude);
+	gps_longitude_abs = labs(gps_longitude);
+	gps_altitude_abs = labs(gps_altitude);
 
 	attributes->gps_latitude[0].num = (uint32_t) gps_latitude_abs;
 	attributes->gps_latitude[0].den = 10000000;

diff --git a/camera/exynos_ion.c b/camera/exynos_ion.c
@@ -100,7 +100,7 @@ int exynos_ion_alloc(struct exynos_camera *exynos_camera, int size)
 	return share_data.fd;
 }
 
-int exynos_ion_free(struct exynos_camera *exynos_camera, int fd)
+int exynos_ion_free(struct exynos_camera __unused *exynos_camera, int fd)
 {
 	close(fd);
 	return 0;