summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2023-05-27 11:37:29 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-11-20 11:06:57 +0100
commit9e8e731571e642d48bf298bca1ebb112fd13965a (patch)
tree071e33487edc10acd0fce162dc1da31cff4ff69b
parentde721d7ef7ac1a9d43151e51130652543173d2ab (diff)
downloadlinux-stable-9e8e731571e642d48bf298bca1ebb112fd13965a.tar.gz
linux-stable-9e8e731571e642d48bf298bca1ebb112fd13965a.tar.bz2
linux-stable-9e8e731571e642d48bf298bca1ebb112fd13965a.zip
fbdev: imsttfb: Fix error path of imsttfb_probe()
[ Upstream commit 518ecb6a209f6ff678aeadf9f2bf870c0982ca85 ] Release ressources when init_imstt() returns failure. Signed-off-by: Helge Deller <deller@gmx.de> Stable-dep-of: aba6ab57a910 ("fbdev: imsttfb: fix a resource leak in probe") Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/video/fbdev/imsttfb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c
index 1b2fb8ed7623..876ddf05e133 100644
--- a/drivers/video/fbdev/imsttfb.c
+++ b/drivers/video/fbdev/imsttfb.c
@@ -1525,8 +1525,10 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto error;
info->pseudo_palette = par->palette;
ret = init_imstt(info);
- if (!ret)
- pci_set_drvdata(pdev, info);
+ if (ret)
+ goto error;
+
+ pci_set_drvdata(pdev, info);
return ret;
error: