aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-11-26 10:39:55 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2010-12-22 12:05:21 +0100
commit3b3c1f24e96c411a95daabb6af9e09c5381f713b (patch)
tree2a3312ed7da7692cb396730dc6021af223f37050 /drivers/watchdog
parentfa6469cb5b2d16703464c344b943e2c025cb7858 (diff)
downloadkernel_samsung_smdk4412-3b3c1f24e96c411a95daabb6af9e09c5381f713b.zip
kernel_samsung_smdk4412-3b3c1f24e96c411a95daabb6af9e09c5381f713b.tar.gz
kernel_samsung_smdk4412-3b3c1f24e96c411a95daabb6af9e09c5381f713b.tar.bz2
watchdog: Fix null pointer dereference while accessing rdc321x platform_data
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>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/rdc321x_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
index 428f8a1..3939e53 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;