Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752780Ab0KVIBM (ORCPT ); Mon, 22 Nov 2010 03:01:12 -0500 Received: from cantor.suse.de ([195.135.220.2]:59570 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752038Ab0KVIBL convert rfc822-to-8bit (ORCPT ); Mon, 22 Nov 2010 03:01:11 -0500 Date: Mon, 22 Nov 2010 09:01:10 +0100 Message-ID: From: Takashi Iwai To: Takashi Iwai Cc: Vasiliy Kulikov , kernel-janitors@vger.kernel.org, Jaroslav Kysela , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ALSA: snd-atmel-abdac: test wrong variable In-Reply-To: References: <1290361209-15121-1-git-send-email-segoon@openwall.com> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1627 Lines: 56 At Mon, 22 Nov 2010 07:56:41 +0100, Takashi Iwai wrote: > > At Sun, 21 Nov 2010 20:40:07 +0300, > Vasiliy Kulikov wrote: > > > > After clk_get() pclk is checked second time instead of sample_clk check. > > > > Signed-off-by: Vasiliy Kulikov > > Applied now. Thanks. Ah, I found out that PTR_ERR() should be fixed as well. An additional patch applied as below. thanks, Takashi === >From e61aabdb7608fd63d9705ab8bbf16f5145acead2 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 22 Nov 2010 08:58:13 +0100 Subject: [PATCH] ALSA: atmel - Fix the return value in error path In the commit 5ad57d20c91bdaf743bd8e3015df5a388314df8d ALSA: snd-atmel-abdac: test wrong variable the return value via PTR_ERR() had to be fixed as well. Signed-off-by: Takashi Iwai --- sound/atmel/abdac.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c index 4e47baad..6e24091 100644 --- a/sound/atmel/abdac.c +++ b/sound/atmel/abdac.c @@ -422,7 +422,7 @@ static int __devinit atmel_abdac_probe(struct platform_device *pdev) sample_clk = clk_get(&pdev->dev, "sample_clk"); if (IS_ERR(sample_clk)) { dev_dbg(&pdev->dev, "no sample clock\n"); - retval = PTR_ERR(pclk); + retval = PTR_ERR(sample_clk); goto out_put_pclk; } clk_enable(pclk); -- 1.7.3.1 -- 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/