Hi Anson,
On Thu, Jun 28, 2018 at 10:35 PM, Anson Huang <Anson.Huang@xxxxxxx> wrote:
> commit bfd694d5e21c ("mmc: core: Add tunable delay
> before detecting card after card is inserted") adds
> "u32 cd_debounce_delay_ms" to the last of mmc_gpio
> struct and cause "char cd_label[0]" NOT work as string
> pointer of card detect label, when "cat /proc/interrupts",
> the devname for card detect gpio is incorrect as below:
>
> 144: 0 gpio-mxc 22 Edge ▒
> 161: 0 gpio-mxc 7 Edge ▒
>
> Making "char cd_label[0]" the last entry of mmc_gpio struct,
> the result is correct as below:
>
> 144: 0 gpio-mxc 22 Edge 2198000.mmc cd
> 161: 0 gpio-mxc 7 Edge 2190000.mmc cd
Please add a Fixes: tag.
> Signed-off-by: Anson Huang <Anson.Huang@xxxxxxx>
> ---
> drivers/mmc/core/slot-gpio.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c
> index ef05e00..1ccf9dc 100644
> --- a/drivers/mmc/core/slot-gpio.c
> +++ b/drivers/mmc/core/slot-gpio.c
> @@ -27,8 +27,8 @@ struct mmc_gpio {
> bool override_cd_active_level;
> irqreturn_t (*cd_gpio_isr)(int irq, void *dev_id);
> char *ro_label;
> - char cd_label[0];
> u32 cd_debounce_delay_ms;
> + char cd_label[0];
Thanks for the fix.
A more robust solution would be:
--- a/drivers/mmc/core/slot-gpio.c
+++ b/drivers/mmc/core/slot-gpio.c
@@ -27,8 +27,8 @@ struct mmc_gpio {
bool override_cd_active_level;
irqreturn_t (*cd_gpio_isr)(int irq, void *dev_id);
char *ro_label;
- char cd_label[0];
u32 cd_debounce_delay_ms;
+ char cd_label[];
};
This way if someone tries to rearrange the struct members in the
future, then GCC will complain with the following error:
error: flexible array member not at end of struct
Please see a158531f3c92 ("gpio: 74x164: Fix crash during .remove()")
which provides a nice explanation for this same kind of problem.
Then you can add:
Tested-by: Fabio Estevam <fabio.estevam@xxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
