This is a note to let you know that I've just added the patch titled spi/spi-fsl-spi: reference correct pdata in
to the 3.3-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: spi-spi-fsl-spi-reference-correct-pdata-in.patch and it can be found in the queue-3.3 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@vger.kernel.org> know about it. >From 067aa4815a9bc12a569d8a06afef50ba5773afbf Mon Sep 17 00:00:00 2001 From: Herton Ronaldo Krzesinski <herton.krzesin...@canonical.com> Date: Fri, 11 May 2012 15:29:50 -0700 Subject: spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control From: Herton Ronaldo Krzesinski <herton.krzesin...@canonical.com> 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.krzesin...@canonical.com> Acked-by: Joakim Tjernlund <joakim.tjernl...@transmode.se> Signed-off-by: Grant Likely <grant.lik...@secretlab.ca> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- 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]; Patches currently in stable-queue which might be from herton.krzesin...@canonical.com are queue-3.3/spi-spi-fsl-spi-reference-correct-pdata-in.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html