Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 164876
b: refs/heads/master
c: ff8147f
h: refs/heads/master
v: v3
  • Loading branch information
Julia Lawall authored and Linus Torvalds committed Sep 23, 2009
1 parent bf74f44 commit 36868a5
Show file tree
Hide file tree
Showing 2 changed files with 6 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: f7a595e98c3140f1271957aa742a6b84407620d4
refs/heads/master: ff8147fe71246b81a48de5f37041b026b57d60ca
7 changes: 5 additions & 2 deletions trunk/drivers/video/au1100fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -715,8 +715,11 @@ int au1100fb_setup(char *options)
}
/* Mode option (only option that start with digit) */
else if (isdigit(this_opt[0])) {
mode = kmalloc(strlen(this_opt) + 1, GFP_KERNEL);
strncpy(mode, this_opt, strlen(this_opt) + 1);
mode = kstrdup(this_opt, GFP_KERNEL);
if (!mode) {
print_err("memory allocation failed");
return -ENOMEM;
}
}
/* Unsupported option */
else {
Expand Down

0 comments on commit 36868a5

Please sign in to comment.