| From 6430e8abfbae24d04e181de6363f3fbb5bc16d4d Mon Sep 17 00:00:00 2001 |
| From: Sakari Ailus <sakari.ailus@linux.intel.com> |
| Date: Wed, 6 Nov 2019 12:57:07 +0100 |
| Subject: [PATCH] media: intel-ipu3: Align struct ipu3_uapi_awb_fr_config_s to |
| 32 bytes |
| |
| commit ce644cf3fa06504c2c71ab1b794160d54aaccbc0 upstream. |
| |
| A struct that needs to be aligned to 32 bytes has a size of 28. Increase |
| the size to 32. |
| |
| This makes elements of arrays of this struct aligned to 32 as well, and |
| other structs where members are aligned to 32 mixing |
| ipu3_uapi_awb_fr_config_s as well as other types. |
| |
| Fixes: commit dca5ef2aa1e6 ("media: staging/intel-ipu3: remove the unnecessary compiler flags") |
| Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> |
| Tested-by: Bingbu Cao <bingbu.cao@intel.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/staging/media/ipu3/include/intel-ipu3.h b/drivers/staging/media/ipu3/include/intel-ipu3.h |
| index 1e7184e4311d..8cc46903040b 100644 |
| --- a/drivers/staging/media/ipu3/include/intel-ipu3.h |
| +++ b/drivers/staging/media/ipu3/include/intel-ipu3.h |
| @@ -449,7 +449,7 @@ struct ipu3_uapi_awb_fr_config_s { |
| __u16 reserved1; |
| __u32 bayer_sign; |
| __u8 bayer_nf; |
| - __u8 reserved2[3]; |
| + __u8 reserved2[7]; |
| } __attribute__((aligned(32))) __packed; |
| |
| /** |
| -- |
| 2.7.4 |
| |
