diff options
| author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2020-04-15 17:40:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-07 13:16:49 +0200 |
| commit | f9e1486e320b831fa5501414d403dad06e97a68e (patch) | |
| tree | 274fdbd40d53d49609ec91accdca6f95a80ac5d5 | |
| parent | 75d1f73c2dcc00685169acecebe20a62fb6364c8 (diff) | |
| download | linux-stable-f9e1486e320b831fa5501414d403dad06e97a68e.tar.gz linux-stable-f9e1486e320b831fa5501414d403dad06e97a68e.tar.bz2 linux-stable-f9e1486e320b831fa5501414d403dad06e97a68e.zip | |
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 c9d52c114a9f ("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>
| -rw-r--r-- | drivers/staging/media/ipu3/include/intel-ipu3.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/media/ipu3/include/intel-ipu3.h b/drivers/staging/media/ipu3/include/intel-ipu3.h index 5f43f631cf62..a607b0158c81 100644 --- a/drivers/staging/media/ipu3/include/intel-ipu3.h +++ b/drivers/staging/media/ipu3/include/intel-ipu3.h @@ -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; /** |