Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946329Ab2EKW34 (ORCPT ); Fri, 11 May 2012 18:29:56 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:58771 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932627Ab2EKW3y (ORCPT ); Fri, 11 May 2012 18:29:54 -0400 From: "Herton R. Krzesinski" To: spi-devel-general@lists.sourceforge.net Cc: Grant Likely , linux-kernel@vger.kernel.org, Kenth Eriksson , Joakim Tjernlund , Laurent Pinchart , Ben Hutchings Subject: [PATCH] spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control Date: Fri, 11 May 2012 15:29:50 -0700 Message-Id: <1336775390-24128-1-git-send-email-herton.krzesinski@canonical.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1528 Lines: 39 From: Herton Ronaldo Krzesinski Commit 178db7d3, "spi: Fix device unregistration when unregistering the bus master", changed spi device initialization of dev.parent pointer to be the master's device pointer instead of his parent. This introduced a bug in spi-fsl-spi, since its usage of spi device pointer was not updated accordingly. This was later fixed by commit 5039a86, "spi/mpc83xx: fix NULL pdata dereference bug", but it missed another spot on fsl_spi_cs_control function where we also need to update usage of spi device pointer. This change address that. Cc: stable@vger.kernel.org Signed-off-by: Herton Ronaldo Krzesinski --- drivers/spi/spi-fsl-spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c index 5f748c0..6a62934 100644 --- a/drivers/spi/spi-fsl-spi.c +++ b/drivers/spi/spi-fsl-spi.c @@ -933,7 +933,7 @@ err: static void fsl_spi_cs_control(struct spi_device *spi, bool on) { - struct device *dev = spi->dev.parent; + struct device *dev = spi->dev.parent->parent; struct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(dev->platform_data); u16 cs = spi->chip_select; int gpio = pinfo->gpios[cs]; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/