From patchwork Wed Nov 24 14:24:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: axel lin X-Patchwork-Id: 353211 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAOEOaJb011855 for ; Wed, 24 Nov 2010 14:24:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752436Ab0KXOYG (ORCPT ); Wed, 24 Nov 2010 09:24:06 -0500 Received: from mail-gw0-f46.google.com ([74.125.83.46]:47122 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750897Ab0KXOYE (ORCPT ); Wed, 24 Nov 2010 09:24:04 -0500 Received: by gwj20 with SMTP id 20so801700gwj.19 for ; Wed, 24 Nov 2010 06:24:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=j1hMuZto89p3mIV13ItgBhKTfMX09A53WIjc4FtCW3k=; b=Mc27pPwyK8TOd5OSxZTG2QgJ+f/7Qf/y5tuGcoI1Oh1hvlKSI5pCATLa42lzviaLaA 6tSI/OyM0rDvCa/vP9tkvGIi1A5LbTcl6KXqF+a3by5L6MY/xRQ+xaKsIAN2aEonja1S Zz9JzARyNAX0hoDxLY2uh6iCPiTOXNsyXqzto= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=Wftw7gLmHrEqN/z4fOW+mQ+AdjnjSwjD6RFsw0zp5MLa5VQtm/HzIXPWNefkpPE4X9 ZxueZ6MR8PiFQI7IAxiK6MluYr+DoHRA2z4ELsABub2B4/4xgS1SrJdonih859vX82KY sqTz3XrQuVPimQIlw4Rb6wkApVGv9wyTTHgbs= Received: by 10.150.203.19 with SMTP id a19mr706325ybg.365.1290608642834; Wed, 24 Nov 2010 06:24:02 -0800 (PST) Received: from [59.112.86.75] (59-112-86-75.dynamic.hinet.net [59.112.86.75]) by mx.google.com with ESMTPS id v39sm1099267yba.7.2010.11.24.06.23.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 24 Nov 2010 06:24:01 -0800 (PST) Subject: [PATCH 2/2 RESEND] ASoC: Fix resource reclaim for osk5912 From: Axel Lin To: linux-kernel@vger.kernel.org Cc: Charulatha , Jarkko Nikula , Liam Girdwood , Mark Brown , linux-omap@vger.kernel.org, alsa-devel@alsa-project.org Date: Wed, 24 Nov 2010 22:24:01 +0800 Message-ID: <1290608641.2235.5.camel@phoenix> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 24 Nov 2010 14:24:37 +0000 (UTC) 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); }