]> asedeno.scripts.mit.edu Git - linux.git/commit
mmc: core: cd_label must be last entry of mmc_gpio struct
authorAnson Huang <Anson.Huang@nxp.com>
Mon, 2 Jul 2018 01:27:47 +0000 (09:27 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 3 Jul 2018 05:12:35 +0000 (07:12 +0200)
commit60feca8f59a0bbdee9545ab52775cad0171151ff
tree89d2dc71820f0291adcf1c42b2050f08bf51a2b4
parent25a98edd5795719c5187e16ea271e8de86e02809
mmc: core: cd_label must be last entry of mmc_gpio struct

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      ▒

Move the cd_label field down to fix this, and drop the
zero from the array size to prevent future similar bugs,
the result is correct as below:

144:          0  gpio-mxc  22 Edge      2198000.mmc cd
161:          0  gpio-mxc   7 Edge      2190000.mmc cd

Fixes: bfd694d5e21c ("mmc: core: Add tunable delay before detecting card after card is inserted")
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Tested-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/core/slot-gpio.c