Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S943016AbcJZNUA (ORCPT ); Wed, 26 Oct 2016 09:20:00 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:55260 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966091AbcJZM1g (ORCPT ); Wed, 26 Oct 2016 08:27:36 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe Leroy , Linus Walleij , Scott Wood Subject: [PATCH 4.8 087/140] soc/fsl/qe: fix gpio save_regs functions Date: Wed, 26 Oct 2016 14:22:27 +0200 Message-Id: <20161026122224.102478619@linuxfoundation.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161026122220.384323763@linuxfoundation.org> References: <20161026122220.384323763@linuxfoundation.org> User-Agent: quilt/0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1176 Lines: 37 4.8-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christophe Leroy 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 Reviewed-by: Linus Walleij Signed-off-by: Scott Wood Signed-off-by: Greg Kroah-Hartman --- 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);