| From 5dc6f3fedee58efa343e822558fc3e2f0eb2ad1f Mon Sep 17 00:00:00 2001 |
| From: Christophe Leroy <christophe.leroy@c-s.fr> |
| Date: Tue, 6 Sep 2016 00:52:16 +0200 |
| Subject: soc/fsl/qe: fix gpio save_regs functions |
| |
| From: Christophe Leroy <christophe.leroy@c-s.fr> |
| |
| commit 5dc6f3fedee58efa343e822558fc3e2f0eb2ad1f upstream. |
| |
| of_mm_gpiochip_add_data() calls mm_gc->save_regs() before |
| setting the data. Therefore ->save_regs() cannot use |
| gpiochip_get_data() |
| |
| An Oops is encountered without this fix. |
| |
| fixes: 1e714e54b5ca5 ("powerpc: qe_lib-gpio: use gpiochip data pointer") |
| Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> |
| Reviewed-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Scott Wood <oss@buserror.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/soc/fsl/qe/gpio.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/soc/fsl/qe/gpio.c |
| +++ b/drivers/soc/fsl/qe/gpio.c |
| @@ -41,7 +41,8 @@ struct qe_gpio_chip { |
| |
| static void qe_gpio_save_regs(struct of_mm_gpio_chip *mm_gc) |
| { |
| - struct qe_gpio_chip *qe_gc = gpiochip_get_data(&mm_gc->gc); |
| + struct qe_gpio_chip *qe_gc = |
| + container_of(mm_gc, struct qe_gpio_chip, mm_gc); |
| struct qe_pio_regs __iomem *regs = mm_gc->regs; |
| |
| qe_gc->cpdata = in_be32(®s->cpdata); |