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

[~andy/linux] / drivers / hwmon / max197.c

diff --git a/drivers/hwmon/max197.c b/drivers/hwmon/max197.c
index b5ebb9198c757e17eaf114d5cf15f7c91a28e14f..96dccaf919d1da4c02b26de8f937f5c401f84ff4 100644 (file)
--- a/drivers/hwmon/max197.c
+++ b/drivers/hwmon/max197.c
@@ -261,7 +261,7 @@ static int max197_probe(struct platform_device *pdev)
 {
        int ch, ret;
        struct max197_data *data;
-       struct max197_platform_data *pdata = pdev->dev.platform_data;
+       struct max197_platform_data *pdata = dev_get_platdata(&pdev->dev);
        enum max197_chips chip = platform_get_device_id(pdev)->driver_data;
 
        if (pdata == NULL) {