From 78179989a06636d8362e2eee01b261d02b1500d2 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Thu, 7 Jan 2016 08:25:24 -0800 Subject: [PATCH] gpio: mpc8xxx: Do not use gpiochip_get_data() in mpc8xxx_gpio_save_regs() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Commit 709d71a17c33 ("gpio: mpc8xxx: use gpiochip data pointer") replaces the use of container_of() with gpiochip_get_data(). However, the data pointer is not yet set by the time the save_regs function is called. Fixes: 709d71a17c33 ("gpio: mpc8xxx: use gpiochip data pointer") Cc: Uwe Kleine-König Cc: Alexander Stein Signed-off-by: Guenter Roeck Signed-off-by: Linus Walleij --- drivers/gpio/gpio-mpc8xxx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c index 21eff0e1df87..9d40787e66c0 100644 --- a/drivers/gpio/gpio-mpc8xxx.c +++ b/drivers/gpio/gpio-mpc8xxx.c @@ -51,7 +51,8 @@ static inline u32 mpc8xxx_gpio2mask(unsigned int gpio) static void mpc8xxx_gpio_save_regs(struct of_mm_gpio_chip *mm) { - struct mpc8xxx_gpio_chip *mpc8xxx_gc = gpiochip_get_data(&mm->gc); + struct mpc8xxx_gpio_chip *mpc8xxx_gc = + container_of(mm, struct mpc8xxx_gpio_chip, mm_gc); mpc8xxx_gc->data = in_be32(mm->regs + GPIO_DAT); } -- 2.34.1