From 8a1e2e6066f0fecc81a620dd75fae93ed5026b1e Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 30 Aug 2010 18:35:24 -0700
Subject: [PATCH] --- yaml --- r: 210248 b: refs/heads/master c:
 628e300cccaa628d8fb92aa28cb7530a3d5f2257 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index da4e4c90ae37..4042e1d401e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7619b1b2e2b96842459f499fd48ec32e3d223d02
+refs/heads/master: 628e300cccaa628d8fb92aa28cb7530a3d5f2257
diff --git a/trunk/net/irda/af_irda.c b/trunk/net/irda/af_irda.c
index 79986a674f6e..fd55b5135de5 100644
--- a/trunk/net/irda/af_irda.c
+++ b/trunk/net/irda/af_irda.c
@@ -824,8 +824,8 @@ static int irda_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 
 	err = irda_open_tsap(self, addr->sir_lsap_sel, addr->sir_name);
 	if (err < 0) {
-		kfree(self->ias_obj->name);
-		kfree(self->ias_obj);
+		irias_delete_object(self->ias_obj);
+		self->ias_obj = NULL;
 		goto out;
 	}