Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751339Ab0KXHSO (ORCPT ); Wed, 24 Nov 2010 02:18:14 -0500 Received: from mail-yw0-f46.google.com ([209.85.213.46]:42611 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750913Ab0KXHSM (ORCPT ); Wed, 24 Nov 2010 02:18:12 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=SNTF61dznQ92ANQwXxkB5pX1TRNF46TbvM/OVxRLcQgKEVLzxBBMGJGiGfnXKg1XKE CodEkJTicBkwHpZZkJFbCkuFIjYgwAvLOIXF9p7bRjNTw1C8FUnLzdW+HZQLWjdgz4Oh z4LDjPLhAFBqAmXpBh5PLXDj1uVAcbge5jQOg= Subject: [PATCH 2/2] ASoC: Fix resource reclaim for osk5912 From: Axel Lin To: linux-kernel Cc: Arun KS , Jarkko Nikula , Liam Girdwood , Mark Brown , linux-omap@vger.kernel.org In-Reply-To: <1290583248.20639.1.camel@mola> References: <1290583248.20639.1.camel@mola> Content-Type: text/plain Date: Wed, 24 Nov 2010 15:23:20 +0800 Message-Id: <1290583400.20639.3.camel@mola> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1493 Lines: 60 Signed-off-by: Axel Lin --- sound/soc/omap/osk5912.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c index 18d053d..7e75e77 100644 --- a/sound/soc/omap/osk5912.c +++ b/sound/soc/omap/osk5912.c @@ -177,7 +177,8 @@ static int __init osk_soc_init(void) tlv320aic23_mclk = clk_get(dev, "mclk"); if (IS_ERR(tlv320aic23_mclk)) { printk(KERN_ERR "Could not get mclk clock\n"); - return -ENODEV; + err = PTR_ERR(tlv320aic23_mclk); + goto err2; } /* @@ -188,7 +189,7 @@ static int __init osk_soc_init(void) if (clk_set_rate(tlv320aic23_mclk, CODEC_CLOCK)) { printk(KERN_ERR "Cannot set MCLK for AIC23 CODEC\n"); err = -ECANCELED; - goto err1; + goto err3; } } @@ -196,9 +197,12 @@ static int __init osk_soc_init(void) (uint) clk_get_rate(tlv320aic23_mclk), CODEC_CLOCK); return 0; -err1: + +err3: clk_put(tlv320aic23_mclk); +err2: platform_device_del(osk_snd_device); +err1: platform_device_put(osk_snd_device); return err; @@ -207,6 +211,7 @@ err1: static void __exit osk_soc_exit(void) { + clk_put(tlv320aic23_mclk); platform_device_unregister(osk_snd_device); } -- 1.7.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/