[lkml]   [2011]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[123/152] watchdog: Fix null pointer dereference while accessing rdc321x platform_data
    2.6.36-stable review patch.  If anyone has any objections, please let us know.


    From: Florian Fainelli <>

    commit 3b3c1f24e96c411a95daabb6af9e09c5381f713b upstream.

    rdc321x-wdt currently fetches its driver specific data by using the
    platform_device->platform_data pointer, this is wrong because the mfd
    device which registers our platform_device has been added using
    mfd_add_device() which sets the platform_device->driver_data pointer

    Signed-off-by: Florian Fainelli <>
    Signed-off-by: Samuel Ortiz <>
    Signed-off-by: Greg Kroah-Hartman <>

    drivers/watchdog/rdc321x_wdt.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/watchdog/rdc321x_wdt.c
    +++ b/drivers/watchdog/rdc321x_wdt.c
    @@ -231,7 +231,7 @@ static int __devinit rdc321x_wdt_probe(s
    struct resource *r;
    struct rdc321x_wdt_pdata *pdata;

    - pdata = pdev->dev.platform_data;
    + pdata = platform_get_drvdata(pdev);
    if (!pdata) {
    dev_err(&pdev->dev, "no platform data supplied\n");
    return -ENODEV;

     \ /
      Last update: 2011-01-06 01:59    [W:2.078 / U:0.032 seconds]
    ©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site