mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 06:33:07 +00:00
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>
This commit is contained in:
parent
fa6469cb5b
commit
3b3c1f24e9
1 changed files with 1 additions and 1 deletions
|
@ -231,7 +231,7 @@ static int __devinit rdc321x_wdt_probe(struct platform_device *pdev)
|
||||||
struct resource *r;
|
struct resource *r;
|
||||||
struct rdc321x_wdt_pdata *pdata;
|
struct rdc321x_wdt_pdata *pdata;
|
||||||
|
|
||||||
pdata = pdev->dev.platform_data;
|
pdata = platform_get_drvdata(pdev);
|
||||||
if (!pdata) {
|
if (!pdata) {
|
||||||
dev_err(&pdev->dev, "no platform data supplied\n");
|
dev_err(&pdev->dev, "no platform data supplied\n");
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
Loading…
Reference in a new issue