| From foo@baz Mon Dec 18 15:03:25 CET 2017 |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Date: Thu, 9 Nov 2017 18:09:28 +0100 |
| Subject: video: fbdev: au1200fb: Return an error code if a memory allocation fails |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| |
| [ 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> |
| --- |
| drivers/video/fbdev/au1200fb.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/video/fbdev/au1200fb.c |
| +++ b/drivers/video/fbdev/au1200fb.c |
| @@ -1680,8 +1680,10 @@ static int au1200fb_drv_probe(struct pla |
| |
| fbi = framebuffer_alloc(sizeof(struct au1200fb_device), |
| &dev->dev); |
| - if (!fbi) |
| + if (!fbi) { |
| + ret = -ENOMEM; |
| goto failed; |
| + } |
| |
| _au1200fb_infos[plane] = fbi; |
| fbdev = fbi->par; |
