diff --git a/[refs] b/[refs]
index 733e31fd0125..48db4cccee52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83ea7445221651dc43cf8d22f81089e0cbccf22b
+refs/heads/master: f4224153098c1103db592b28f304beeb9c02481b
diff --git a/trunk/drivers/acpi/toshiba_acpi.c b/trunk/drivers/acpi/toshiba_acpi.c
index bed8e53a5ee8..73b1d8aeae9d 100644
--- a/trunk/drivers/acpi/toshiba_acpi.c
+++ b/trunk/drivers/acpi/toshiba_acpi.c
@@ -263,6 +263,9 @@ dispatch_write(struct file* file, const char __user * buffer,
 	 * destination so that sscanf can be used on it safely.
 	 */
 	tmp_buffer = kmalloc(count + 1, GFP_KERNEL);
+	if(!tmp_buffer)
+		return -ENOMEM;
+
 	if (copy_from_user(tmp_buffer, buffer, count)) {
 		result = -EFAULT;
 	}