From 1fa5ef4e8d2b0213fd75f16df21f99176460f3e9 Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Thu, 25 Aug 2011 15:59:09 -0700
Subject: [PATCH] --- yaml --- r: 263331 b: refs/heads/master c:
 7e8aa048989bf7e0604996a3e2068fb1a81f81bd h: refs/heads/master i:   263329:
 e82a93db571380fa832b97c2faa11f801cdd3477   263327:
 5b2927216818ba04720e14d3c62bd15d60f6b4d7 v: v3

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

diff --git a/[refs] b/[refs]
index 9d9051661f16..17a6a8c291b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30ecad51849ae132dc6ef6ddb62d499c7257515b
+refs/heads/master: 7e8aa048989bf7e0604996a3e2068fb1a81f81bd
diff --git a/trunk/drivers/char/msm_smd_pkt.c b/trunk/drivers/char/msm_smd_pkt.c
index b6f8a65c9960..8eca55deb3a3 100644
--- a/trunk/drivers/char/msm_smd_pkt.c
+++ b/trunk/drivers/char/msm_smd_pkt.c
@@ -379,9 +379,8 @@ static int __init smd_pkt_init(void)
 	for (i = 0; i < NUM_SMD_PKT_PORTS; ++i) {
 		smd_pkt_devp[i] = kzalloc(sizeof(struct smd_pkt_dev),
 					  GFP_KERNEL);
-		if (IS_ERR(smd_pkt_devp[i])) {
-			r = PTR_ERR(smd_pkt_devp[i]);
-			pr_err("kmalloc() failed %d\n", r);
+		if (!smd_pkt_devp[i]) {
+			pr_err("kmalloc() failed\n");
 			goto clean_cdevs;
 		}