---

yaml --- r: 348436 b: refs/heads/master c: cfdee8f h: refs/heads/master v: v3
git-mirror · Jan 4, 2013 · 623efa7 · 623efa7
1 parent 249c42c
commit 623efa7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af8cd946136a1c1e9614ac9f9fc78e58654582ac
+refs/heads/master: cfdee8f421759c4cf173291977b71757ff4eae27
diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_gsc.c
@@ -1687,8 +1687,7 @@ static int __devinit gsc_probe(struct platform_device *pdev)
 	ctx->gsc_clk = clk_get(dev, "gscl");
 	if (IS_ERR(ctx->gsc_clk)) {
 		dev_err(dev, "failed to get gsc clock.\n");
-		ret = PTR_ERR(ctx->gsc_clk);
-		goto err_ctx;
+		return PTR_ERR(ctx->gsc_clk);
 	}
 
 	/* resource memory */
@@ -1711,15 +1710,15 @@ static int __devinit gsc_probe(struct platform_device *pdev)
 	if (!res) {
 		dev_err(dev, "failed to request irq resource.\n");
 		ret = -ENOENT;
-		goto err_get_regs;
+		goto err_clk;
 	}
 
 	ctx->irq = res->start;
 	ret = request_threaded_irq(ctx->irq, NULL, gsc_irq_handler,
 		IRQF_ONESHOT, "drm_gsc", ctx);
 	if (ret < 0) {
 		dev_err(dev, "failed to request irq.\n");
-		goto err_get_regs;
+		goto err_clk;
 	}
 
 	/* context initailization */
@@ -1763,12 +1762,8 @@ static int __devinit gsc_probe(struct platform_device *pdev)
 	pm_runtime_disable(dev);
 err_get_irq:
 	free_irq(ctx->irq, ctx);
-err_get_regs:
-	devm_iounmap(dev, ctx->regs);
 err_clk:
 	clk_put(ctx->gsc_clk);
-err_ctx:
-	devm_kfree(dev, ctx);
 	return ret;
 }
 
@@ -1786,12 +1781,8 @@ static int __devexit gsc_remove(struct platform_device *pdev)
 	pm_runtime_disable(dev);
 
 	free_irq(ctx->irq, ctx);
-	devm_iounmap(dev, ctx->regs);
-
 	clk_put(ctx->gsc_clk);
 
-	devm_kfree(dev, ctx);
-
 	return 0;
 }