summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorEvgeny Novikov <novikov@ispras.ru>2020-07-02 19:05:40 +0300
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2020-07-10 17:17:28 +0300
commit80a00e90dedec514686ac1eb7e7b8e60e1d9aec9 (patch)
tree8b1bdad8d2d2c98b5de5d6b86ac949c32fca83d9 /drivers/video
parent9907797a09d23182aa36479dac6f28defcfb2714 (diff)
downloadlinux-80a00e90dedec514686ac1eb7e7b8e60e1d9aec9.tar.xz
fbdev: da8xx-fb: go to proper label on error handling paths in probe
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 <novikov@ispras.ru> Cc: Sekhar Nori <nsekhar@ti.com> Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200702160540.24546-1-novikov@ispras.ru
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/da8xx-fb.c4
1 files 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);