Skip to content

Commit

Permalink
spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control
Browse files Browse the repository at this point in the history
Commit 178db7d, "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>
Acked-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
  • Loading branch information
Herton Ronaldo Krzesinski authored and Grant Likely committed May 20, 2012
1 parent bc98d13 commit 067aa48
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/spi/spi-fsl-spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -933,7 +933,7 @@ static struct spi_master * __devinit fsl_spi_probe(struct device *dev,

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];
Expand Down

0 comments on commit 067aa48

Please sign in to comment.