From ad9d9aaaeea0b71eda700ad57d2150d4d852ac49 Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@intel.com>
Date: Sun, 22 Nov 2009 12:10:10 -0700
Subject: [PATCH] --- yaml --- r: 168864 b: refs/heads/master c:
 56adf7e8127d601b172e180b44551ce83404348f h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/dma/shdma.c | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 3cf3907b87a0..eae43629633a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49954c1567cb0d70d28bb5512d471dc5bd4e2c3f
+refs/heads/master: 56adf7e8127d601b172e180b44551ce83404348f
diff --git a/trunk/drivers/dma/shdma.c b/trunk/drivers/dma/shdma.c
index b3b065c4e5c1..034ecf0ace03 100644
--- a/trunk/drivers/dma/shdma.c
+++ b/trunk/drivers/dma/shdma.c
@@ -640,17 +640,16 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
 #endif
 	struct sh_dmae_device *shdev;
 
+	/* get platform data */
+	if (!pdev->dev.platform_data)
+		return -ENODEV;
+
 	shdev = kzalloc(sizeof(struct sh_dmae_device), GFP_KERNEL);
 	if (!shdev) {
 		dev_err(&pdev->dev, "No enough memory\n");
-		err = -ENOMEM;
-		goto shdev_err;
+		return -ENOMEM;
 	}
 
-	/* get platform data */
-	if (!pdev->dev.platform_data)
-		goto shdev_err;
-
 	/* platform data */
 	memcpy(&shdev->pdata, pdev->dev.platform_data,
 			sizeof(struct sh_dmae_pdata));
@@ -722,7 +721,6 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
 rst_err:
 	kfree(shdev);
 
-shdev_err:
 	return err;
 }