Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281073
b: refs/heads/master
c: 1aa5eb6
h: refs/heads/master
i:
  281071: cf1f511
v: v3
  • Loading branch information
Thomas Meyer authored and Greg Kroah-Hartman committed Nov 27, 2011
1 parent c863cf0 commit 69b8a43
Show file tree
Hide file tree
Showing 2 changed files with 2 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: cd420765eb48f052c627a934017f8e95fb011aef
refs/heads/master: 1aa5eb67d70fa1f801b8b988d7e48e264c283c5e
3 changes: 1 addition & 2 deletions trunk/drivers/staging/speakup/kobjects.c
Original file line number Diff line number Diff line change
Expand Up @@ -265,12 +265,11 @@ static ssize_t keymap_store(struct kobject *kobj, struct kobj_attribute *attr,
unsigned long flags;

spk_lock(flags);
in_buff = kmalloc(count + 1, GFP_ATOMIC);
in_buff = kmemdup(buf, count + 1, GFP_ATOMIC);
if (!in_buff) {
spk_unlock(flags);
return -ENOMEM;
}
memcpy(in_buff, buf, count + 1);
if (strchr("dDrR", *in_buff)) {
set_key_info(key_defaults, key_buf);
pr_info("keymap set to default values\n");
Expand Down

0 comments on commit 69b8a43

Please sign in to comment.