From: Mauro Carvalho Chehab Date: Thu, 1 Oct 2015 22:10:55 +0000 (-0300) Subject: [media] rcar_jpu: Fix namespace for two __be16 vars X-Git-Tag: firefly_0821_release~176^2~795^2~68 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=996347612dc58b534e397a742b3bfd3023850bb1;p=firefly-linux-kernel-4.4.55.git [media] rcar_jpu: Fix namespace for two __be16 vars Fixes those sparse warnings: drivers/media/platform/rcar_jpu.c:1150:51: warning: incorrect type in assignment (different base types) drivers/media/platform/rcar_jpu.c:1150:51: expected unsigned short [unsigned] [short] [usertype] drivers/media/platform/rcar_jpu.c:1150:51: got restricted __be16 [usertype] drivers/media/platform/rcar_jpu.c:1152:50: warning: incorrect type in assignment (different base types) drivers/media/platform/rcar_jpu.c:1152:50: expected unsigned short [unsigned] [short] [usertype] drivers/media/platform/rcar_jpu.c:1152:50: got restricted __be16 [usertype] Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/rcar_jpu.c b/drivers/media/platform/rcar_jpu.c index 7533b9e16649..c80395df67bc 100644 --- a/drivers/media/platform/rcar_jpu.c +++ b/drivers/media/platform/rcar_jpu.c @@ -1147,9 +1147,9 @@ static void jpu_buf_finish(struct vb2_buffer *vb) buffer = vb2_plane_vaddr(vb, 0); memcpy(buffer, jpeg_hdrs[jpu_buf->compr_quality], JPU_JPEG_HDR_SIZE); - *(u16 *)(buffer + JPU_JPEG_HEIGHT_OFFSET) = + *(__be16 *)(buffer + JPU_JPEG_HEIGHT_OFFSET) = cpu_to_be16(q_data->format.height); - *(u16 *)(buffer + JPU_JPEG_WIDTH_OFFSET) = + *(__be16 *)(buffer + JPU_JPEG_WIDTH_OFFSET) = cpu_to_be16(q_data->format.width); *(buffer + JPU_JPEG_SUBS_OFFSET) = q_data->fmtinfo->subsampling; }