diff options
author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2017-11-09 18:09:28 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-20 10:04:57 +0100 |
commit | ac0468efee605b6a6260223cbac53aea37412615 (patch) | |
tree | 8b8d416c93f95a520f49edb3b7073825b6619265 | |
parent | 033d20b727f31fe047ea2f314eb0ac3a87df71ce (diff) | |
download | linux-stable-ac0468efee605b6a6260223cbac53aea37412615.tar.gz linux-stable-ac0468efee605b6a6260223cbac53aea37412615.tar.bz2 linux-stable-ac0468efee605b6a6260223cbac53aea37412615.zip |
video: fbdev: au1200fb: Return an error code if a memory allocation fails
[ Upstream commit 8cae353e6b01ac3f18097f631cdbceb5ff28c7f3 ]
'ret' is known to be 0 at this point.
In case of memory allocation error in 'framebuffer_alloc()', return
-ENOMEM instead.
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>
-rw-r--r-- | drivers/video/fbdev/au1200fb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/fbdev/au1200fb.c b/drivers/video/fbdev/au1200fb.c index e5897fce3c03..789d3f16ff9f 100644 --- a/drivers/video/fbdev/au1200fb.c +++ b/drivers/video/fbdev/au1200fb.c @@ -1680,8 +1680,10 @@ static int au1200fb_drv_probe(struct platform_device *dev) fbi = framebuffer_alloc(sizeof(struct au1200fb_device), &dev->dev); - if (!fbi) + if (!fbi) { + ret = -ENOMEM; goto failed; + } _au1200fb_infos[plane] = fbi; fbdev = fbi->par; |