Skip to content

Commit

Permalink
watchdog: Fix null pointer dereference while accessing rdc321x platfo…
Browse files Browse the repository at this point in the history
…rm_data

commit 3b3c1f2 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>
  • Loading branch information
ffainelli authored and AK committed Feb 6, 2011
1 parent bf4a80c commit c28dd25
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/watchdog/rdc321x_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit c28dd25

Please sign in to comment.