From 02bfc0dbb8cd717de3c38c1aeae59bb22de8ae24 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 26 Feb 2011 15:55:24 +0300
Subject: [PATCH] --- yaml --- r: 243119 b: refs/heads/master c:
 31f007598cc547ba3239524470386af8ae5f1c13 h: refs/heads/master i:   243117:
 aa776f1a317514a911f492a1a3bc0103bf46e91f   243115:
 0f054ae87d0fff59dcb3a3422d51d782c0a61692   243111:
 8572f93cc9ac81c2dfe680b5dc2c55103b16cfcc   243103:
 df5dfdf1698a86df818afad61a008feeb9992ca9 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/platform/x86/sony-laptop.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 86f9d7f03946..66ac4c96c530 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7227dedbc22f66f1bd310c866053b08de0496e38
+refs/heads/master: 31f007598cc547ba3239524470386af8ae5f1c13
diff --git a/trunk/drivers/platform/x86/sony-laptop.c b/trunk/drivers/platform/x86/sony-laptop.c
index 363b89ef61cc..bd1b9adfbaf9 100644
--- a/trunk/drivers/platform/x86/sony-laptop.c
+++ b/trunk/drivers/platform/x86/sony-laptop.c
@@ -768,6 +768,8 @@ static int sony_nc_handles_setup(struct platform_device *pd)
 	int result;
 
 	handles = kzalloc(sizeof(*handles), GFP_KERNEL);
+	if (!handles)
+		return -ENOMEM;
 
 	sysfs_attr_init(&handles->devattr.attr);
 	handles->devattr.attr.name = "handles";
@@ -1458,6 +1460,8 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd)
 		return 0;
 
 	kbdbl_handle = kzalloc(sizeof(*kbdbl_handle), GFP_KERNEL);
+	if (!kbdbl_handle)
+		return -ENOMEM;
 
 	sysfs_attr_init(&kbdbl_handle->mode_attr.attr);
 	kbdbl_handle->mode_attr.attr.name = "kbd_backlight";