Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218519
b: refs/heads/master
c: f356910
h: refs/heads/master
i:
  218517: d152d89
  218515: f5283af
  218511: b73cac9
v: v3
  • Loading branch information
Julia Lawall authored and Linus Torvalds committed Oct 28, 2010
1 parent ae7fee0 commit 1ae6539
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f11b478d461b7113eb4603b3914aaf15b7788e87
refs/heads/master: f35691062a138484b51bf53b36ae8a4495d8fb91
6 changes: 4 additions & 2 deletions trunk/drivers/video/gbefb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1143,8 +1143,10 @@ static int __devinit gbefb_probe(struct platform_device *p_dev)
return -ENOMEM;

#ifndef MODULE
if (fb_get_options("gbefb", &options))
return -ENODEV;
if (fb_get_options("gbefb", &options)) {
ret = -ENODEV;
goto out_release_framebuffer;
}
gbefb_setup(options);
#endif

Expand Down

0 comments on commit 1ae6539

Please sign in to comment.