summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2017-11-09 18:09:28 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-20 10:10:23 +0100
commitdf235d2ee36e70a43b122c0eb34064794ef4464c (patch)
treefed0af5d2cfd414635b850f01134589138336333 /drivers/video
parent456279d0e3ad7cb3b6b90aeb07c189c7f8590ab0 (diff)
downloadlinux-stable-df235d2ee36e70a43b122c0eb34064794ef4464c.tar.gz
linux-stable-df235d2ee36e70a43b122c0eb34064794ef4464c.tar.bz2
linux-stable-df235d2ee36e70a43b122c0eb34064794ef4464c.zip
video: fbdev: au1200fb: Release some resources if a memory allocation fails
[ Upstream commit 451f130602619a17c8883dd0b71b11624faffd51 ] We should go through the error handling code instead of returning -ENOMEM directly. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Cc: Tejun Heo <tj@kernel.org> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/au1200fb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/fbdev/au1200fb.c b/drivers/video/fbdev/au1200fb.c
index 5f04b4096c42..99d6cfb168b5 100644
--- a/drivers/video/fbdev/au1200fb.c
+++ b/drivers/video/fbdev/au1200fb.c
@@ -1701,7 +1701,8 @@ static int au1200fb_drv_probe(struct platform_device *dev)
if (!fbdev->fb_mem) {
print_err("fail to allocate frambuffer (size: %dK))",
fbdev->fb_len / 1024);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto failed;
}
/*