[lkml]   [2011]   [Feb]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[PATCH] [116/139] watchdog: Fix null pointer dereference while accessing rdc321x platform_data
2.6.35-longterm review patch.  If anyone has any objections, please let me 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 <>
Signed-off-by: Andi Kleen <>

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

Index: linux-2.6.35.y/drivers/watchdog/rdc321x_wdt.c
--- linux-2.6.35.y.orig/drivers/watchdog/rdc321x_wdt.c
+++ linux-2.6.35.y/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-02-02 01:53    [from the cache]
©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site