Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / drivers / input / misc / max8997_haptic.c

diff --git a/kernel/drivers/input/misc/max8997_haptic.c b/kernel/drivers/input/misc/max8997_haptic.c
index a806ba3..8d6326d 100644 (file)
--- a/kernel/drivers/input/misc/max8997_haptic.c
+++ b/kernel/drivers/input/misc/max8997_haptic.c
@@ -255,12 +255,14 @@ static int max8997_haptic_probe(struct platform_device *pdev)
        struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);
        const struct max8997_platform_data *pdata =
                                        dev_get_platdata(iodev->dev);
-       const struct max8997_haptic_platform_data *haptic_pdata =
-                                       pdata->haptic_pdata;
+       const struct max8997_haptic_platform_data *haptic_pdata = NULL;
        struct max8997_haptic *chip;
        struct input_dev *input_dev;
        int error;
 
+       if (pdata)
+               haptic_pdata = pdata->haptic_pdata;
+
        if (!haptic_pdata) {
                dev_err(&pdev->dev, "no haptic platform data\n");
                return -EINVAL;