lkml.org 
[lkml]   [2012]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 096/117] spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Herton Ronaldo Krzesinski <herton.krzesinski@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.krzesinski@canonical.com>
    Acked-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/spi/spi-fsl-spi.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
    index 5f748c0..6a62934 100644
    --- a/drivers/spi/spi-fsl-spi.c
    +++ b/drivers/spi/spi-fsl-spi.c
    @@ -933,7 +933,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];



    \
     
     \ /
      Last update: 2012-05-28 06:01    [W:3.173 / U:0.440 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site