2 files changed, 10 insertions, 12 deletions

diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c
index 711ab7ff5ced..cfe2ea890dc0 100644
--- a/sound/soc/tegra/tegra_asoc_utils.c
+++ b/sound/soc/tegra/tegra_asoc_utils.c
@@ -113,35 +113,33 @@ int tegra_asoc_utils_init(void)
 	int ret;
 
 	clk_pll_a = clk_get_sys(NULL, "pll_a");
-	if (IS_ERR_OR_NULL(clk_pll_a)) {
+	if (IS_ERR(clk_pll_a)) {
 		pr_err(PREFIX "Can't retrieve clk pll_a\n");
 		ret = PTR_ERR(clk_pll_a);
 		goto err;
 	}
 
 	clk_pll_a_out0 = clk_get_sys(NULL, "pll_a_out0");
-	if (IS_ERR_OR_NULL(clk_pll_a_out0)) {
+	if (IS_ERR(clk_pll_a_out0)) {
 		pr_err(PREFIX "Can't retrieve clk pll_a_out0\n");
 		ret = PTR_ERR(clk_pll_a_out0);
-		goto err;
+		goto err_put_pll_a;
 	}
 
 	clk_cdev1 = clk_get_sys(NULL, "cdev1");
-	if (IS_ERR_OR_NULL(clk_cdev1)) {
+	if (IS_ERR(clk_cdev1)) {
 		pr_err(PREFIX "Can't retrieve clk cdev1\n");
 		ret = PTR_ERR(clk_cdev1);
-		goto err;
+		goto err_put_pll_a_out0;
 	}
 
 	return 0;
 
+err_put_pll_a_out0:
+	clk_put(clk_pll_a_out0);
+err_put_pll_a:
+	clk_put(clk_pll_a);
 err:
-	if (!IS_ERR_OR_NULL(clk_cdev1))
-		clk_put(clk_cdev1);
-	if (!IS_ERR_OR_NULL(clk_pll_a_out0))
-		clk_put(clk_pll_a_out0);
-	if (!IS_ERR_OR_NULL(clk_pll_a))
-		clk_put(clk_pll_a);
 	return ret;
 }
 
diff --git a/sound/soc/tegra/tegra_i2s.c b/sound/soc/tegra/tegra_i2s.c
index 1730509c8ac2..6d668785e9af 100644
--- a/sound/soc/tegra/tegra_i2s.c
+++ b/sound/soc/tegra/tegra_i2s.c
@@ -385,7 +385,7 @@ static __devinit int tegra_i2s_platform_probe(struct platform_device *pdev)
 
 	snprintf(clk_name, sizeof(clk_name), DRV_NAME ".%d", pdev->id);
 	i2s->clk_i2s = clk_get_sys(clk_name, NULL);
-	if (IS_ERR_OR_NULL(i2s->clk_i2s)) {
+	if (IS_ERR(i2s->clk_i2s)) {
 		pr_err("Can't retrieve i2s clock\n");
 		ret = PTR_ERR(i2s->clk_i2s);
 		goto err_free;