aboutsummaryrefslogtreecommitdiff
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorPaul Fertser <fercerpav@gmail.com>2009-10-17 04:47:35 +0400
committerPaul Fertser <fercerpav@gmail.com>2009-10-17 04:52:57 +0400
commit350d5560bb262e73e1f1c05bf488fea6750a52d6 (patch)
tree46a2abf96452b8c7abcb206dba8176e60083e23e /drivers/watchdog
parent3daf677d5e8e4d6a89845952e0a503c4bd57e456 (diff)
Fix memleak in pcf50633_client_dev_registe
Ported from 207ec43e8c5a54dfc82a0e65af5b8f2765e3cbb8
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/pcf50606_wdt.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/watchdog/pcf50606_wdt.c b/drivers/watchdog/pcf50606_wdt.c
index f0858747bf9..6a53c664b21 100644
--- a/drivers/watchdog/pcf50606_wdt.c
+++ b/drivers/watchdog/pcf50606_wdt.c
@@ -158,7 +158,6 @@ static void pcf50606_wdt_irq(int irq, void *unused)
int __init pcf50606_wdt_probe(struct platform_device *pdev)
{
- struct pcf50606_subdev_pdata *pdata;
int err;
if (pcf) {
@@ -166,13 +165,7 @@ int __init pcf50606_wdt_probe(struct platform_device *pdev)
return -ENODEV;
}
- pdata = pdev->dev.platform_data;
- if (!pdata) {
- dev_err(&pdev->dev, "No platform data available\n");
- return -EINVAL;
- }
-
- pcf = pdata->pcf;
+ pcf = dev_to_pcf50606(pdev->dev.parent);
err = misc_register(&pcf50606_wdt_miscdev);
if (err) {