Home Home > GIT Browse > openSUSE-42.3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2018-07-06 07:04:05 +0200
committerKernel Build Daemon <kbuild@suse.de>2018-07-06 07:04:05 +0200
commit5df5691ca33d059bb587970bb7392531e450d510 (patch)
tree2b474f38bda1dfde92ec4beac7f4bc352df0413d
parentd72e30d63c0b21e61f0eb9bf2b1e82c010e7a599 (diff)
parent1798b78f4989e257a9f99d492c70566982d203eb (diff)
Merge branch 'SLE12-SP3' into openSUSE-42.3
-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 accfef71e984..10376e2ea7cb 100644
--- a/drivers/video/fbdev/stifb.c
+++ b/drivers/video/fbdev/stifb.c
@@ -1128,7 +1128,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;