summaryrefslogtreecommitdiff
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:07:27 +0100
commit90e2591f6f3fd15ac766ffbaed119f43f01fef33 (patch)
tree48b20a2a00fa9b76f25956b618146595ef6d8aaa /drivers/video
parent92c3c7db8336f6678b31ee0d08ecf3bab81a80ff (diff)
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 6c2b2ca4a909..29d1639f5c5e 100644
--- a/drivers/video/fbdev/au1200fb.c
+++ b/drivers/video/fbdev/au1200fb.c
@@ -1700,7 +1700,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;
}
/*