From: Florian Fainelli Date: Fri, 26 Nov 2010 09:39:55 +0000 (+0100) Subject: watchdog: Fix null pointer dereference while accessing rdc321x platform_data X-Git-Tag: v2.6.36.3~29 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8ce65f6d58a7cc3d6393422f6c4d39b4f6128f45;p=karo-tx-linux.git 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 Signed-off-by: Samuel Ortiz Signed-off-by: Greg Kroah-Hartman --- 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;