drm/panfrost: Add missing check for pfdev->regulator
authorSteven Price <steven.price@arm.com>
Thu, 22 Aug 2019 09:32:18 +0000 (10:32 +0100)
committerRob Herring <robh@kernel.org>
Fri, 23 Aug 2019 16:03:11 +0000 (11:03 -0500)
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
drivers/gpu/drm/panfrost/panfrost_devfreq.c

index 710d903f8e0dcffc4f8c437e0a44ccbd393ce1e5..a1f5fa6a742ab9e311aa638485adae78d0a44d74 100644 (file)
@@ -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;
        }