X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Fdrivers%2Finput%2Fmisc%2Fmax8997_haptic.c;fp=kernel%2Fdrivers%2Finput%2Fmisc%2Fmax8997_haptic.c;h=8d6326d7e7beaf1875bb95af385dff1285f10b0e;hb=52f993b8e89487ec9ee15a7fb4979e0f09a45b27;hp=a806ba3818f7267dd2036dd870c4f60ca28dc0d5;hpb=c189ccac5702322ed843fe17057035b7222a59b6;p=kvmfornfv.git diff --git a/kernel/drivers/input/misc/max8997_haptic.c b/kernel/drivers/input/misc/max8997_haptic.c index a806ba381..8d6326d7e 100644 --- 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;