lkml.org 
[lkml]   [2010]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] i2c-davinci: Fix use of default platform data if none supplied.
    Date
    There is a bug in the i2c-davinci device init routine that attempts
    to use default platform data if none is supplied (e.g., is NULL).
    This patch fixes the bug.

    Signed-off-by: Michael Williamson <michael.williamson@criticallink.com>
    ---
    drivers/i2c/busses/i2c-davinci.c | 8 +++++---
    1 files changed, 5 insertions(+), 3 deletions(-)

    diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
    index 2222c87..6d4eeeb 100644
    --- a/drivers/i2c/busses/i2c-davinci.c
    +++ b/drivers/i2c/busses/i2c-davinci.c
    @@ -235,10 +235,12 @@ static void i2c_davinci_calc_clk_dividers(struct davinci_i2c_dev *dev)
    */
    static int i2c_davinci_init(struct davinci_i2c_dev *dev)
    {
    - struct davinci_i2c_platform_data *pdata = dev->dev->platform_data;
    + struct davinci_i2c_platform_data *pdata;

    - if (!pdata)
    - pdata = &davinci_i2c_platform_data_default;
    + if (!dev->dev->platform_data)
    + dev->dev->platform_data = &davinci_i2c_platform_data_default;
    +
    + pdata = dev->dev->platform_data;

    /* put I2C into reset */
    davinci_i2c_reset_ctrl(dev, 0);
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2010-09-04 18:11    [W:0.052 / U:59.744 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site