lkml.org 
[lkml]   [2012]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/3] power/ab8500_charger: harden platform data check
    Date
    From: Linus Walleij <linus.walleij@linaro.org>

    If no platform data at all is supplied the driver crashes,
    extend the checks to be more careful so we can compile in the
    driver and boot also without platform data present.

    Cc: Arun Murthy <arun.murthy@stericsson.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    ---
    drivers/power/ab8500_charger.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
    index e2b4acc..79dc584 100644
    --- a/drivers/power/ab8500_charger.c
    +++ b/drivers/power/ab8500_charger.c
    @@ -2551,13 +2551,12 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev)

    /* get charger specific platform data */
    plat_data = pdev->dev.platform_data;
    - di->pdata = plat_data->charger;
    -
    - if (!di->pdata) {
    + if (!plat_data || !plat_data->charger) {
    dev_err(di->dev, "no charger platform data supplied\n");
    ret = -EINVAL;
    goto free_device_info;
    }
    + di->pdata = plat_data->charger;

    /* get battery specific platform data */
    di->bat = plat_data->battery;
    --
    1.7.9.2


    \
     
     \ /
      Last update: 2012-04-13 10:19    [W:0.020 / U:95.736 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site