---

yaml --- r: 168864 b: refs/heads/master c: 56adf7e h: refs/heads/master v: v3
git-mirror · Nov 22, 2009 · ad9d9aa · ad9d9aa
1 parent 8685233
commit ad9d9aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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;
 }