From 46aac46e58c4aca84058cc306f0132d623fb432a Mon Sep 17 00:00:00 2001
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Thu, 26 May 2011 13:44:12 +0200
Subject: [PATCH] --- yaml --- r: 257473 b: refs/heads/master c:
 2cdcd951c456fecbeb11fc42aa7d90f172dc58ef h: refs/heads/master i:   257471:
 567dfc516f443d37877720ed5a6bc322b3a13d72 v: v3

---
 [refs]                                | 2 +-
 trunk/sound/soc/atmel/atmel_ssc_dai.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 10c101ceec9a..b54b8ce20d82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97b4fc3c445bf10b6fe0d8543137a6ad30a0fdab
+refs/heads/master: 2cdcd951c456fecbeb11fc42aa7d90f172dc58ef
diff --git a/trunk/sound/soc/atmel/atmel_ssc_dai.c b/trunk/sound/soc/atmel/atmel_ssc_dai.c
index 7fbfa051f6e1..a7a7bbc07627 100644
--- a/trunk/sound/soc/atmel/atmel_ssc_dai.c
+++ b/trunk/sound/soc/atmel/atmel_ssc_dai.c
@@ -838,10 +838,8 @@ int atmel_ssc_set_audio(int ssc_id)
 	}
 
 	ssc_pdev = platform_device_alloc("atmel-ssc-dai", ssc_id);
-	if (!ssc_pdev) {
-		ssc_free(ssc);
+	if (!ssc_pdev)
 		return -ENOMEM;
-	}
 
 	/* If we can grab the SSC briefly to parent the DAI device off it */
 	ssc = ssc_request(ssc_id);