summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2018-03-28 16:34:27 +0200
committerBen Hutchings <ben@decadent.org.uk>2018-10-21 08:45:04 +0100
commitd66cbed98ede5c6a4113ccc3e28afe41e025ea9d (patch)
tree65c86c6a1f1a870a178a5a1e9e2af435b9be5a47 /drivers
parent5e342e3191f357b679db97456aef824dd9b278cf (diff)
downloadlinux-stable-d66cbed98ede5c6a4113ccc3e28afe41e025ea9d.tar.gz
linux-stable-d66cbed98ede5c6a4113ccc3e28afe41e025ea9d.tar.bz2
linux-stable-d66cbed98ede5c6a4113ccc3e28afe41e025ea9d.zip
video/fbdev/stifb: Return -ENOMEM after a failed kzalloc() in stifb_init_fb()
commit f9815f945aff2204b8afbbb9d2182024eb44a194 upstream. Replace an error code for the indication of a memory allocation failure in this function. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2: Initial git repository build") Suggested-by: Rolf Eike Beer <eike-kernel@sf-tec.de> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Cc: Helge Deller <deller@gmx.de> Cc: "James E. J. Bottomley" <jejb@parisc-linux.org> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/fbdev/stifb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/stifb.c b/drivers/video/fbdev/stifb.c
index cfe8a2f905c5..14e78f575765 100644
--- a/drivers/video/fbdev/stifb.c
+++ b/drivers/video/fbdev/stifb.c
@@ -1091,7 +1091,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
fb = kzalloc(sizeof(*fb), GFP_ATOMIC);
if (!fb) {
printk(KERN_ERR "stifb: Could not allocate stifb structure\n");
- return -ENODEV;
+ return -ENOMEM;
}
info = &fb->info;