[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20120520051216.AAAD73E03B8@localhost>
Date: Sat, 19 May 2012 23:12:16 -0600
From: Grant Likely <grant.likely@...retlab.ca>
To: Joakim Tjernlund <joakim.tjernlund@...nsmode.se>,
"Herton R. Krzesinski" <herton.krzesinski@...onical.com>
Cc: Ben Hutchings <ben@...adent.org.uk>,
Kenth Eriksson <kenth.eriksson@...nsmode.com>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
linux-kernel@...r.kernel.org,
spi-devel-general@...ts.sourceforge.net
Subject: Re: [PATCH] spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control
On Sun, 13 May 2012 11:22:25 +0200, Joakim Tjernlund <joakim.tjernlund@...nsmode.se> wrote:
> "Herton R. Krzesinski" <herton.krzesinski@...onical.com> wrote on 2012/05/12 00:29:50:
> >
> > From: Herton Ronaldo Krzesinski <herton.krzesinski@...onical.com>
> >
> > 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@...r.kernel.org
> > Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@...onical.com>
> > ---
> > 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 <Joakim.Tjernlund@...nsmode.se>
>
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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists