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

Commit 95ffc2a5 authored by Sakari Ailus's avatar Sakari Ailus Committed by Greg Kroah-Hartman
Browse files

media: staging: ipu3-imgu: Move alignment attribute to field 



commit 8c038effd893920facedf18c2c0976cec4a33408 upstream.

Move the alignment attribute of struct ipu3_uapi_awb_fr_config_s to the
field in struct ipu3_uapi_4a_config, the other location where the struct
is used.

Fixes: commit c9d52c11 ("media: staging: imgu: Address a compiler warning on alignment")
Reported-by: default avatarTomasz Figa <tfiga@chromium.org>
Tested-by: default avatarBingbu Cao <bingbu.cao@intel.com>
Cc: stable@vger.kernel.org # for v5.3 and up
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5b6e1523

drivers/staging/media/ipu3/include/intel-ipu3.h

+3 −2
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ struct ipu3_uapi_awb_fr_config_s { 
	__u32 bayer_sign;

	__u8 bayer_nf;

	__u8 reserved2[7];

} __attribute__((aligned(32))) __packed;

} __packed;



/**

 * struct ipu3_uapi_4a_config - 4A config
@@ -466,7 +466,8 @@ struct ipu3_uapi_4a_config { 
	struct ipu3_uapi_ae_grid_config ae_grd_config;

	__u8 padding[20];

	struct ipu3_uapi_af_config_s af_config;

	struct ipu3_uapi_awb_fr_config_s awb_fr_config;

	struct ipu3_uapi_awb_fr_config_s awb_fr_config

		__attribute__((aligned(32)));

} __packed;



/**