lkml.org 
[lkml]   [2014]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 008/198] extcon: max8997: Fix NULL pointer exception on missing pdata
    Date
    3.11.10.13 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Krzysztof Kozlowski <k.kozlowski@samsung.com>

    commit dfee4111febf3d9ef3a640b2cd6205c75f4e7e3d upstream.

    Fix NULL pointer exception when platform data is not supplied. The
    driver dereferenced pdata pointer where it could be NULL.

    Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
    Fixes: 810d601f07c
    Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/extcon/extcon-max8997.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
    index 67d6738d85a0..09f4a9374cf5 100644
    --- a/drivers/extcon/extcon-max8997.c
    +++ b/drivers/extcon/extcon-max8997.c
    @@ -712,7 +712,7 @@ static int max8997_muic_probe(struct platform_device *pdev)
    goto err_irq;
    }

    - if (pdata->muic_pdata) {
    + if (pdata && pdata->muic_pdata) {
    struct max8997_muic_platform_data *muic_pdata
    = pdata->muic_pdata;

    --
    1.9.1


    \
     
     \ /
      Last update: 2014-07-03 13:01    [W:4.017 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site