From 5975f7c890310baace2410e1348dd957bb514a0e Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Sun, 12 May 2013 15:19:57 +0200 Subject: [PATCH] --- yaml --- r: 375801 b: refs/heads/master c: 5f68d04d39eeb16b9ea7639f62c4ae59163b4813 h: refs/heads/master i: 375799: e9a00069f0d085e1918792dfd52e62f957c34a6f v: v3 --- [refs] | 2 +- trunk/sound/soc/fsl/imx-ssi.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2878104a485f..f33041487ab0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02fdb79f3623de6281dae9ae26ff5a8e1aa58970 +refs/heads/master: 5f68d04d39eeb16b9ea7639f62c4ae59163b4813 diff --git a/trunk/sound/soc/fsl/imx-ssi.c b/trunk/sound/soc/fsl/imx-ssi.c index 902fab02b851..c6fa03e2114a 100644 --- a/trunk/sound/soc/fsl/imx-ssi.c +++ b/trunk/sound/soc/fsl/imx-ssi.c @@ -540,11 +540,6 @@ static int imx_ssi_probe(struct platform_device *pdev) clk_prepare_enable(ssi->clk); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - ret = -ENODEV; - goto failed_get_resource; - } - ssi->base = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(ssi->base)) { ret = PTR_ERR(ssi->base); @@ -633,7 +628,6 @@ static int imx_ssi_probe(struct platform_device *pdev) snd_soc_unregister_component(&pdev->dev); failed_register: release_mem_region(res->start, resource_size(res)); -failed_get_resource: clk_disable_unprepare(ssi->clk); failed_clk: