Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11a18c0d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Fix 32-bit compilation issues."

parents c3e35637 35f4c35a

drivers/media/platform/msm/camera_v2/jpeg_dma/msm_jpeg_dma_hw.c

+5 −3
Original line number Diff line number Diff line
@@ -79,8 +79,10 @@ static const struct msm_jpegdma_block msm_jpegdma_block_sel[] = { 
 */

static inline long long jpegdma_do_div(long long num, long long den)

{

	do_div(num, den);

	return num;

	uint64_t n = (uint64_t) num;



	do_div(n, (uint32_t)den);

	return n;

}



/*
@@ -919,7 +921,7 @@ static int msm_jpegdma_hw_add_plane_offset(struct msm_jpegdma_plane *plane, 
static int msm_jpegdma_hw_calc_config(struct msm_jpegdma_size_config *size_cfg,

	struct msm_jpegdma_plane *plane)

{

	u64 scale_hor, scale_ver, phase;

	u64 scale_hor, scale_ver, phase = 0;

	u64 in_width, in_height;

	u64 out_width, out_height;

	struct msm_jpegdma_config *config;