From 3d26274f7c64cb31668946fc5c3b7bbc162780b5 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Wed, 26 May 2010 14:43:55 -0700
Subject: [PATCH] --- yaml --- r: 198800 b: refs/heads/master c:
 87575437d8173c7da48a4dee25399807c7bec9cb h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/char/ppdev.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8034bb81fce0..31b1f5f895a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56d611a04fb2db77334e06274de4daed92e2c626
+refs/heads/master: 87575437d8173c7da48a4dee25399807c7bec9cb
diff --git a/trunk/drivers/char/ppdev.c b/trunk/drivers/char/ppdev.c
index fdd37543aa79..02abfddce45a 100644
--- a/trunk/drivers/char/ppdev.c
+++ b/trunk/drivers/char/ppdev.c
@@ -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);