From 710fdcd8d781bd49c522e8614d5d765141a2cd9d Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Fri, 15 Jul 2011 17:25:28 +0800
Subject: [PATCH] --- yaml --- r: 261135 b: refs/heads/master c:
 40ad5b37914368a4f2c5ff1e72712375d6f1188b h: refs/heads/master i:   261133:
 9ebd781889e2383a83d4e1b2891806fdc3ae88ce   261131:
 98d84c3374200db5fc639e817118276f1d981ac1   261127:
 029b812755db023d23297654726b85f4b32a6ef9   261119:
 c7ba6cefaa46bc36b671a25f4d4316bdd87fa3e2 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/dma/imx-sdma.c | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 72d14c629f45..03c3e0a3e9be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62550cd7c08f1a38d0ade1de18baec10f83412bb
+refs/heads/master: 40ad5b37914368a4f2c5ff1e72712375d6f1188b
diff --git a/trunk/drivers/dma/imx-sdma.c b/trunk/drivers/dma/imx-sdma.c
index a7708b481eab..df400691f9a0 100644
--- a/trunk/drivers/dma/imx-sdma.c
+++ b/trunk/drivers/dma/imx-sdma.c
@@ -1126,22 +1126,14 @@ static int __init sdma_get_firmware(struct sdma_engine *sdma,
 		const char *fw_name)
 {
 	const struct firmware *fw;
-	char *fwname;
 	const struct sdma_firmware_header *header;
 	int ret;
 	const struct sdma_script_start_addrs *addr;
 	unsigned short *ram_code;
 
-	fwname = kasprintf(GFP_KERNEL, "%s", fw_name);
-	if (!fwname)
-		return -ENOMEM;
-
-	ret = request_firmware(&fw, fwname, sdma->dev);
-	if (ret) {
-		kfree(fwname);
+	ret = request_firmware(&fw, fw_name, sdma->dev);
+	if (ret)
 		return ret;
-	}
-	kfree(fwname);
 
 	if (fw->size < sizeof(*header))
 		goto err_firmware;