Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751399Ab2ETFMe (ORCPT ); Sun, 20 May 2012 01:12:34 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:60985 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751124Ab2ETFMT (ORCPT ); Sun, 20 May 2012 01:12:19 -0400 From: Grant Likely Subject: Re: [PATCH] spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control To: Joakim Tjernlund , "Herton R. Krzesinski" Cc: Ben Hutchings , Kenth Eriksson , Laurent Pinchart , linux-kernel@vger.kernel.org, spi-devel-general@lists.sourceforge.net In-Reply-To: References: <1336775390-24128-1-git-send-email-herton.krzesinski@canonical.com> Date: Sat, 19 May 2012 23:12:16 -0600 Message-Id: <20120520051216.AAAD73E03B8@localhost> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1994 Lines: 52 On Sun, 13 May 2012 11:22:25 +0200, Joakim Tjernlund wrote: > "Herton R. Krzesinski" wrote on 2012/05/12 00:29:50: > > > > 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]; > > So it seems > Acked-by: Joakim Tjernlund > Applied, thanks. g. -- Grant Likely, B.Sc, P.Eng. Secret Lab Technologies, Ltd. -- 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/