Re: [ 71/94] spi/spi-fsl-spi: reference correct pdata infsl_spi_cs_control

[Herton Ronaldo Krzesinski]

On Sun, May 27, 2012 at 10:05:34AM +0900, Greg KH wrote:
> 3.3-stable review patch.  If anyone has any objections, please let me know.
> 
> ------------------

In addition to this fix, please also cherry-pick into 3.3 series commit
5039a86973cd35bdb2f64d28ee12f13fe2bb5a4c, "spi/mpc83xx: fix NULL pdata
dereference bug". I noted now that 3.3 stable is missing it. It
was the first part addressing the issue introduced by commit 178db7d3 in
spi-fsl-spi, that is included in 3.3.

> 
> From: Herton Ronaldo Krzesinski <herton.krzesinski@xxxxxxxxxxxxx>
> 
> commit 067aa4815a9bc12a569d8a06afef50ba5773afbf upstream.
> 
> 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.
> 
> Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@xxxxxxxxxxxxx>
> Acked-by: Joakim Tjernlund <Joakim.Tjernlund@xxxxxxxxxxxx>
> Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> 
> ---
>  drivers/spi/spi-fsl-spi.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- a/drivers/spi/spi-fsl-spi.c
> +++ b/drivers/spi/spi-fsl-spi.c
> @@ -931,7 +931,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];
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

-- 
[]'s
Herton
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/