]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
watchdog: Fix null pointer dereference while accessing rdc321x platform_data
authorFlorian Fainelli <florian@openwrt.org>
Fri, 26 Nov 2010 09:39:55 +0000 (10:39 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Wed, 22 Dec 2010 11:05:21 +0000 (12:05 +0100)
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
instead.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
CC: stable@kernel.org
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/watchdog/rdc321x_wdt.c

index 428f8a1583e8598ae69414f8171e21a3bbbf2ba8..3939e53f5f981d327ff344d522ab59f4df43238b 100644 (file)
@@ -231,7 +231,7 @@ static int __devinit rdc321x_wdt_probe(struct platform_device *pdev)
        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;