Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 198800
b: refs/heads/master
c: 8757543
h: refs/heads/master
v: v3
  • Loading branch information
Julia Lawall authored and Linus Torvalds committed May 27, 2010
1 parent f6cc217 commit 3d26274
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 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: 56d611a04fb2db77334e06274de4daed92e2c626
refs/heads/master: 87575437d8173c7da48a4dee25399807c7bec9cb
4 changes: 1 addition & 3 deletions trunk/drivers/char/ppdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -287,12 +287,10 @@ static int register_device (int minor, struct pp_struct *pp)
char *name;
int fl;

name = kmalloc (strlen (CHRDEV) + 3, GFP_KERNEL);
name = kasprintf(GFP_KERNEL, CHRDEV "%x", minor);
if (name == NULL)
return -ENOMEM;

sprintf (name, CHRDEV "%x", minor);

port = parport_find_number (minor);
if (!port) {
printk (KERN_WARNING "%s: no associated port!\n", name);
Expand Down

0 comments on commit 3d26274

Please sign in to comment.