* [PATCH] spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control
@ 2012-05-11 22:29 Herton R. Krzesinski
2012-05-13 9:22 ` Joakim Tjernlund
0 siblings, 1 reply; 3+ messages in thread
From: Herton R. Krzesinski @ 2012-05-11 22:29 UTC (permalink / raw)
To: spi-devel-general
Cc: Grant Likely, linux-kernel, Kenth Eriksson, Joakim Tjernlund,
Laurent Pinchart, Ben Hutchings
From: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.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@vger.kernel.org
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.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];
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control
2012-05-11 22:29 [PATCH] spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control Herton R. Krzesinski
@ 2012-05-13 9:22 ` Joakim Tjernlund
2012-05-20 5:12 ` Grant Likely
0 siblings, 1 reply; 3+ messages in thread
From: Joakim Tjernlund @ 2012-05-13 9:22 UTC (permalink / raw)
To: Herton R. Krzesinski
Cc: Ben Hutchings, Grant Likely, Kenth Eriksson, Laurent Pinchart,
linux-kernel, spi-devel-general
"Herton R. Krzesinski" <herton.krzesinski@canonical.com> wrote on 2012/05/12 00:29:50:
>
> From: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.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@vger.kernel.org
> Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.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@transmode.se>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control
2012-05-13 9:22 ` Joakim Tjernlund
@ 2012-05-20 5:12 ` Grant Likely
0 siblings, 0 replies; 3+ messages in thread
From: Grant Likely @ 2012-05-20 5:12 UTC (permalink / raw)
To: Joakim Tjernlund, Herton R. Krzesinski
Cc: Ben Hutchings, Kenth Eriksson, Laurent Pinchart, linux-kernel,
spi-devel-general
On Sun, 13 May 2012 11:22:25 +0200, Joakim Tjernlund <joakim.tjernlund@transmode.se> wrote:
> "Herton R. Krzesinski" <herton.krzesinski@canonical.com> wrote on 2012/05/12 00:29:50:
> >
> > From: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.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@vger.kernel.org
> > Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.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@transmode.se>
>
Applied, thanks.
g.
--
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-20 5:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-11 22:29 [PATCH] spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control Herton R. Krzesinski
2012-05-13 9:22 ` Joakim Tjernlund
2012-05-20 5:12 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).