From b952395e6b04ac4bcc813f602711595c5ee158c2 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 25 Apr 2012 11:47:02 +0300
Subject: [PATCH] --- yaml --- r: 304046 b: refs/heads/master c:
 a1d26ac0ddc4ea561e17a75dd3b5f9d3c1812f16 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/extcon/extcon_class.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b153822be4d1..2f02f952a7f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b9606106ba58d2bd80610f97e06fea58206b47c
+refs/heads/master: a1d26ac0ddc4ea561e17a75dd3b5f9d3c1812f16
diff --git a/trunk/drivers/extcon/extcon_class.c b/trunk/drivers/extcon/extcon_class.c
index dbd3bfba42da..53c64a98b0be 100644
--- a/trunk/drivers/extcon/extcon_class.c
+++ b/trunk/drivers/extcon/extcon_class.c
@@ -621,6 +621,8 @@ int extcon_dev_register(struct extcon_dev *edev, struct device *dev)
 	}
 
 	edev->dev = kzalloc(sizeof(struct device), GFP_KERNEL);
+	if (!edev->dev)
+		return -ENOMEM;
 	edev->dev->parent = dev;
 	edev->dev->class = extcon_class;
 	edev->dev->release = extcon_dev_release;