Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[cascardo/linux.git] / drivers / mfd / htc-egpio.c

diff --git a/drivers/mfd/htc-egpio.c b/drivers/mfd/htc-egpio.c
index 26aca54..49f39fe 100644 (file)
--- a/drivers/mfd/htc-egpio.c
+++ b/drivers/mfd/htc-egpio.c
@@ -261,7 +261,7 @@ static void egpio_write_cache(struct egpio_info *ei)
 
 static int __init egpio_probe(struct platform_device *pdev)
 {
-       struct htc_egpio_platform_data *pdata = pdev->dev.platform_data;
+       struct htc_egpio_platform_data *pdata = dev_get_platdata(&pdev->dev);
        struct resource   *res;
        struct egpio_info *ei;
        struct gpio_chip  *chip;