Commit 067aa481 authored May 11, 2012 by Herton Ronaldo Krzesinski Committed by Grant Likely May 19, 2012

spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control

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
5039a869, "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>
Acked-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

parent bc98d13f

drivers/spi/spi-fsl-spi.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -933,7 +933,7 @@ err:

	static void fsl_spi_cs_control(struct spi_device *spi, bool on)		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);		struct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(dev->platform_data);
	u16 cs = spi->chip_select;		u16 cs = spi->chip_select;
	int gpio = pinfo->gpios[cs];		int gpio = pinfo->gpios[cs];