diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-11-26 10:39:55 +0100 |
|---|---|---|
| committer | AK <andi@firstfloor.org> | 2011-02-06 11:03:48 -0800 |
| commit | c28dd2596ae32a0c500745f4061648a0045fed2c (patch) | |
| tree | 35cab9f67c9fcf0a71bad9083d21d52148d62982 /drivers | |
| parent | bf4a80cbf1ec11260c1a458586f2433431646994 (diff) | |
| download | linux-stable-c28dd2596ae32a0c500745f4061648a0045fed2c.tar.gz linux-stable-c28dd2596ae32a0c500745f4061648a0045fed2c.tar.bz2 linux-stable-c28dd2596ae32a0c500745f4061648a0045fed2c.zip | |
watchdog: Fix null pointer dereference while accessing rdc321x platform_data
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
instead.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/rdc321x_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c index 428f8a1583e8..3939e53f5f98 100644 --- a/drivers/watchdog/rdc321x_wdt.c +++ b/drivers/watchdog/rdc321x_wdt.c @@ -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; |