diff options
author | Steven Price <steven.price@arm.com> | 2019-08-22 11:32:18 +0200 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2019-08-28 17:02:38 +0200 |
commit | c90f30812a79abeb9f7f0f78e69d314104b825be (patch) | |
tree | ea89f348b12b6379cb63c74ad41eddff9e515b5e /drivers/gpu/drm/panfrost | |
parent | Merge tag 'drm-next-5.4-2019-08-23' of git://people.freedesktop.org/~agd5f/li... (diff) | |
download | linux-c90f30812a79abeb9f7f0f78e69d314104b825be.tar.xz linux-c90f30812a79abeb9f7f0f78e69d314104b825be.zip |
drm/panfrost: Add missing check for pfdev->regulator
When modifying panfrost_devfreq_target() to support a device without a
regulator defined I missed the check on the error path. Let's add it.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: e21dd290881b ("drm/panfrost: Enable devfreq to work without regulator")
Signed-off-by: Steven Price <steven.price@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190822093218.26014-1-steven.price@arm.com
Diffstat (limited to 'drivers/gpu/drm/panfrost')
-rw-r--r-- | drivers/gpu/drm/panfrost/panfrost_devfreq.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c index 710d903f8e0d..a1f5fa6a742a 100644 --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c @@ -53,8 +53,10 @@ static int panfrost_devfreq_target(struct device *dev, unsigned long *freq, if (err) { dev_err(dev, "Cannot set frequency %lu (%d)\n", target_rate, err); - regulator_set_voltage(pfdev->regulator, pfdev->devfreq.cur_volt, - pfdev->devfreq.cur_volt); + if (pfdev->regulator) + regulator_set_voltage(pfdev->regulator, + pfdev->devfreq.cur_volt, + pfdev->devfreq.cur_volt); return err; } |