Skip to content

Commit

Permalink
media: staging: ipu3-imgu: Move alignment attribute to field
Browse files Browse the repository at this point in the history
commit 8c038ef 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 c9d52c1 ("media: staging: imgu: Address a compiler warning on alignment")
Reported-by: Tomasz Figa <tfiga@chromium.org>
Tested-by: Bingbu Cao <bingbu.cao@intel.com>
Cc: stable@vger.kernel.org # for v5.3 and up
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Sakari Ailus authored and Greg Kroah-Hartman committed Jun 7, 2020
1 parent a57840a commit b6a8a6e
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/staging/media/ipu3/include/intel-ipu3.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;

/**
Expand Down

0 comments on commit b6a8a6e

Please sign in to comment.