Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 067aa4815a9bc12a569d8a06afef50ba5773afbf

Authored by Herton Ronaldo Krzesinski
Committed by Grant Likely
1 parent bc98d13f5c
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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
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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/spi/spi-fsl-spi.c
Diff comments   View file @ 067aa48
... ... @@ -933,7 +933,7 @@
933 933  
934 934 static void fsl_spi_cs_control(struct spi_device *spi, bool on)
935 935 {
936   - struct device *dev = spi->dev.parent;
  936 + struct device *dev = spi->dev.parent->parent;
937 937 struct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(dev->platform_data);
938 938 u16 cs = spi->chip_select;
939 939 int gpio = pinfo->gpios[cs];