From c3b6c26b93346dd7b3bae0fe7137355bbdec2125 Mon Sep 17 00:00:00 2001
From: Peter Senna Tschudin <peter.senna@gmail.com>
Date: Fri, 5 Oct 2012 11:33:03 +0000
Subject: [PATCH] --- yaml --- r: 332897 b: refs/heads/master c:
 87286477c4688e5324e24916a1b2da4972ea84ba h: refs/heads/master i:   332895:
 ac25d000ca7922bf5040ef3e30d27438e23b26a6 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/irda/irtty-sir.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3f3ceeddac80..c93bd763e7e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0968a9d1c8f1d0d91e64faf49f6b1ef4f8775aa6
+refs/heads/master: 87286477c4688e5324e24916a1b2da4972ea84ba
diff --git a/trunk/drivers/net/irda/irtty-sir.c b/trunk/drivers/net/irda/irtty-sir.c
index 30087ca23a0f..6e4d4b62c9a8 100644
--- a/trunk/drivers/net/irda/irtty-sir.c
+++ b/trunk/drivers/net/irda/irtty-sir.c
@@ -459,8 +459,10 @@ static int irtty_open(struct tty_struct *tty)
 
 	/* allocate private device info block */
 	priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-	if (!priv)
+	if (!priv) {
+		ret = -ENOMEM;
 		goto out_put;
+	}
 
 	priv->magic = IRTTY_MAGIC;
 	priv->tty = tty;