From ed71c32ccd0e99df7a7a6d1f32377283f019aa61 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Fri, 26 Nov 2010 10:39:55 +0100 Subject: [PATCH] --- yaml --- r: 223518 b: refs/heads/master c: 3b3c1f24e96c411a95daabb6af9e09c5381f713b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/rdc321x_wdt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 429ba6cac507..85421cb7a9e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa6469cb5b2d16703464c344b943e2c025cb7858 +refs/heads/master: 3b3c1f24e96c411a95daabb6af9e09c5381f713b diff --git a/trunk/drivers/watchdog/rdc321x_wdt.c b/trunk/drivers/watchdog/rdc321x_wdt.c index 428f8a1583e8..3939e53f5f98 100644 --- a/trunk/drivers/watchdog/rdc321x_wdt.c +++ b/trunk/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;