diff options
| author | Mark Brown <broonie@kernel.org> | 2017-07-20 13:25:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-07-20 13:25:14 +0100 |
| commit | 01be70f6b487674f4a064ff263bd2873aa1fb807 (patch) | |
| tree | a9085b2ff4bf5be9f1364f0d11c6eff56f2aaeda /drivers | |
| parent | 95afa5c610ebe0e3c40fe5e9fbfe62ce7c2d2584 (diff) | |
| parent | e3b53b8a465133ce57f9722aab5617b8e0f9657f (diff) | |
Merge remote-tracking branch 'regulator/topic/qcom' into regulator-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/regulator/qcom_rpm-regulator.c | 5 | ||||
| -rw-r--r-- | drivers/regulator/qcom_smd-regulator.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/regulator/qcom_rpm-regulator.c b/drivers/regulator/qcom_rpm-regulator.c index 1b2acc43fea1..88dc0b0f003c 100644 --- a/drivers/regulator/qcom_rpm-regulator.c +++ b/drivers/regulator/qcom_rpm-regulator.c @@ -959,6 +959,11 @@ static int rpm_reg_probe(struct platform_device *pdev) } match = of_match_device(rpm_of_match, &pdev->dev); + if (!match) { + dev_err(&pdev->dev, "failed to match device\n"); + return -ENODEV; + } + for (reg = match->data; reg->name; reg++) { vreg = devm_kmalloc(&pdev->dev, sizeof(*vreg), GFP_KERNEL); if (!vreg) diff --git a/drivers/regulator/qcom_smd-regulator.c b/drivers/regulator/qcom_smd-regulator.c index f35994a2a5be..940fe1b78411 100644 --- a/drivers/regulator/qcom_smd-regulator.c +++ b/drivers/regulator/qcom_smd-regulator.c @@ -570,6 +570,11 @@ static int rpm_reg_probe(struct platform_device *pdev) } match = of_match_device(rpm_of_match, &pdev->dev); + if (!match) { + dev_err(&pdev->dev, "failed to match device\n"); + return -ENODEV; + } + for (reg = match->data; reg->name; reg++) { vreg = devm_kzalloc(&pdev->dev, sizeof(*vreg), GFP_KERNEL); if (!vreg) |