diff --git a/[refs] b/[refs]
index 310f2c40a9a8..3c373cfc8764 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fe6206f400646a2322096b56c59891d530e8d51
+refs/heads/master: 4b4fd27c0b5ec638a1f06ced9226fd95229dbbf0
diff --git a/trunk/drivers/parisc/led.c b/trunk/drivers/parisc/led.c
index 188bc8496a26..d02be78a4138 100644
--- a/trunk/drivers/parisc/led.c
+++ b/trunk/drivers/parisc/led.c
@@ -176,16 +176,18 @@ static ssize_t led_proc_write(struct file *file, const char *buf,
 	size_t count, loff_t *pos)
 {
 	void *data = PDE(file->f_path.dentry->d_inode)->data;
-	char *cur, lbuf[count + 1];
+	char *cur, lbuf[32];
 	int d;
 
 	if (!capable(CAP_SYS_ADMIN))
 		return -EACCES;
 
-	memset(lbuf, 0, count + 1);
+	if (count >= sizeof(lbuf))
+		count = sizeof(lbuf)-1;
 
 	if (copy_from_user(lbuf, buf, count))
 		return -EFAULT;
+	lbuf[count] = 0;
 
 	cur = lbuf;