Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 139272
b: refs/heads/master
c: 0a5d924
h: refs/heads/master
v: v3
  • Loading branch information
Andres Salomon authored and Linus Torvalds committed Apr 1, 2009
1 parent 51b709a commit 7d846ae
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 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: 0fd853118dd821de59106c5b9a0a2a6f488bc4b5
refs/heads/master: 0a5d924e5954e81a905907512f8c7a1cbf81d700
5 changes: 4 additions & 1 deletion trunk/drivers/video/sm501fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1525,7 +1525,10 @@ static int sm501fb_init_fb(struct fb_info *fb,
}

/* initialise and set the palette */
fb_alloc_cmap(&fb->cmap, NR_PALETTE, 0);
if (fb_alloc_cmap(&fb->cmap, NR_PALETTE, 0)) {
dev_err(info->dev, "failed to allocate cmap memory\n");
return -ENOMEM;
}
fb_set_cmap(&fb->cmap, fb);

ret = (fb->fbops->fb_check_var)(&fb->var, fb);
Expand Down

0 comments on commit 7d846ae

Please sign in to comment.