From e232e304df6019521551a701832b56211cc0114d Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Wed, 8 Jun 2011 11:06:30 +0200 Subject: [PATCH] --- yaml --- r: 254594 b: refs/heads/master c: 63ef1124f1cb07836f232b8eaed1ae4c73899643 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/pmic8xxx-pwrkey.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c5720b7c6d0f..e2c9ed8392d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d08382a0e8a272fed9517a1b39ae6be634a77d5 +refs/heads/master: 63ef1124f1cb07836f232b8eaed1ae4c73899643 diff --git a/trunk/drivers/input/misc/pmic8xxx-pwrkey.c b/trunk/drivers/input/misc/pmic8xxx-pwrkey.c index 97e07e786e41..b3cfb9c71e66 100644 --- a/trunk/drivers/input/misc/pmic8xxx-pwrkey.c +++ b/trunk/drivers/input/misc/pmic8xxx-pwrkey.c @@ -90,7 +90,8 @@ static int __devinit pmic8xxx_pwrkey_probe(struct platform_device *pdev) unsigned int delay; u8 pon_cntl; struct pmic8xxx_pwrkey *pwrkey; - const struct pm8xxx_pwrkey_platform_data *pdata = mfd_get_data(pdev); + const struct pm8xxx_pwrkey_platform_data *pdata = + dev_get_platdata(&pdev->dev); if (!pdata) { dev_err(&pdev->dev, "power key platform data not supplied\n");