lkml.org 
[lkml]   [2015]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 060/151] mmc: sdhci-pxav3: fix setting of pdata->clk_delay_cycles
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: Jisheng Zhang <jszhang@marvell.com>

    commit 14460dbaf7a5a0488963fdb8232ad5c8a8cca7b7 upstream.

    Current code checks "clk_delay_cycles > 0" to know whether the optional
    "mrvl,clk_delay_cycles" is set or not. But of_property_read_u32() doesn't
    touch clk_delay_cycles if the property is not set. And type of
    clk_delay_cycles is u32, so we may always set pdata->clk_delay_cycles as a
    random value.

    This patch fix this problem by check the return value of of_property_read_u32()
    to know whether the optional clk-delay-cycles is set or not.

    Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/mmc/host/sdhci-pxav3.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/mmc/host/sdhci-pxav3.c
    +++ b/drivers/mmc/host/sdhci-pxav3.c
    @@ -261,8 +261,8 @@ static struct sdhci_pxa_platdata *pxav3_
    if (!pdata)
    return NULL;

    - of_property_read_u32(np, "mrvl,clk-delay-cycles", &clk_delay_cycles);
    - if (clk_delay_cycles > 0)
    + if (!of_property_read_u32(np, "mrvl,clk-delay-cycles",
    + &clk_delay_cycles))
    pdata->clk_delay_cycles = clk_delay_cycles;

    return pdata;



    \
     
     \ /
      Last update: 2015-03-04 09:21    [W:8.259 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site