| Message ID | 1452183898-19343-1-git-send-email-linux@roeck-us.net |
|---|---|
| State | New |
| Headers | show |
On Thu, Jan 7, 2016 at 5:24 PM, Guenter Roeck <linux@roeck-us.net> wrote: > Commit 6aa7dbfa2877 ("gpio: mm-lantiq: 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: 6aa7dbfa2877 ("gpio: mm-lantiq: use gpiochip data pointer") > Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> > Cc: John Crispin <blogic@openwrt.org> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> Patch applied. > It might make sense to merge this patch into the patch causing the problem. Nah, don't wanna rebase. Plus people should see all mistakes I make... Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpio/gpio-mm-lantiq.c b/drivers/gpio/gpio-mm-lantiq.c index a2071ed69f79..54e5d8257d34 100644 --- a/drivers/gpio/gpio-mm-lantiq.c +++ b/drivers/gpio/gpio-mm-lantiq.c @@ -91,7 +91,8 @@ static int ltq_mm_dir_out(struct gpio_chip *gc, unsigned offset, int value) */ static void ltq_mm_save_regs(struct of_mm_gpio_chip *mm_gc) { - struct ltq_mm *chip = gpiochip_get_data(&mm_gc->gc); + struct ltq_mm *chip = + container_of(mm_gc, struct ltq_mm, mmchip); /* tell the ebu controller which memory address we will be using */ ltq_ebu_w32(CPHYSADDR(chip->mmchip.regs) | 0x1, LTQ_EBU_ADDRSEL1);
Commit 6aa7dbfa2877 ("gpio: mm-lantiq: 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: 6aa7dbfa2877 ("gpio: mm-lantiq: use gpiochip data pointer") Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Cc: John Crispin <blogic@openwrt.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- It might make sense to merge this patch into the patch causing the problem. drivers/gpio/gpio-mm-lantiq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)