fb_probe() can successfully allocate a new frame buffer, but then fail
to perform some operations with regulator. In these cases fb_probe()
goes to label err_pm_runtime_disable where the frame buffer is not
released. The patch makes fb_probe() to go to label err_release_fb on
corresponding error handling paths.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Evgeny Novikov <novi...@ispras.ru>
---
 drivers/video/fbdev/da8xx-fb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/video/fbdev/da8xx-fb.c b/drivers/video/fbdev/da8xx-fb.c
index 73c3c4c8cc12..e38c0e3f9c61 100644
--- a/drivers/video/fbdev/da8xx-fb.c
+++ b/drivers/video/fbdev/da8xx-fb.c
@@ -1402,14 +1402,14 @@ static int fb_probe(struct platform_device *device)
        if (IS_ERR(par->lcd_supply)) {
                if (PTR_ERR(par->lcd_supply) == -EPROBE_DEFER) {
                        ret = -EPROBE_DEFER;
-                       goto err_pm_runtime_disable;
+                       goto err_release_fb;
                }
 
                par->lcd_supply = NULL;
        } else {
                ret = regulator_enable(par->lcd_supply);
                if (ret)
-                       goto err_pm_runtime_disable;
+                       goto err_release_fb;
        }
 
        fb_videomode_to_var(&da8xx_fb_var, lcdc_info);
-- 
2.16.4

Reply via email to