From patchwork Mon Dec 11 12:14:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 121387 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2712760qgn; Mon, 11 Dec 2017 04:14:28 -0800 (PST) X-Google-Smtp-Source: ACJfBovSOoYrbaqRTVa8oC9OUlMbVkT71Jn6AMomWQYiRRx8PwwZVMCLHtJzsytA0NL5Rb8dEguP X-Received: by 10.28.17.75 with SMTP id 72mr649329wmr.125.1512994468696; Mon, 11 Dec 2017 04:14:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512994468; cv=none; d=google.com; s=arc-20160816; b=fCRrFFaCwCyroSJ9TnrzHA5Y/3lPJf3LDPgJ3HHo+97Iz2aqGDXGAR6Ra+CcrdmCFK OM+oyeDRP+4aGyMnvCx/UYAvzX3NOecZ3yIcTxyPHU/YlO7949+9gdzEbwNQG1IW6Ei5 7WIT97t+muaWSFvYK9fDHngd6PU5mbszUpRvZqaaPExRsl+KTGl5JqzTJYGIxdyfwA9B Mav+DLs4pmAnoic81lpGnb0MDHC5gU9sGRp+2Nl5bpicJI1NwPNiGr3fG6rbdjl2ogwT zoQTLXRJ+SkYwVYAepXFY2g80CGIZ4Oef5uxO4imLar6kt8kJ++gL1l8600tifDoxLKU kaug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=vVIccpg9HfGNxKPSmPRqMZGB0YOjKbAzrMwNpTLmyCQ=; b=c/OZzP/Q00qotwikZfIPLiSNvRLtTpeiSZRPp2p29wV44HYKtA9m+3bNz1w/XJs7xg 3CEuCVCKDNvylzI6A+y/VVfBPMEl1aDStZ7zmLlv+LFIY40xQjjHIXE/5VnMhqdv7BkU NpZZRzLhy3JOtSb3aO4lDcVgtnYSfZ84RuUmNst+hZVrVxlgvD/AOFKtUY4+2LuUC/I3 0g6phBT0ux3qO5qVZcwUyDZ0bAARUSL1GAlcdbDrvJffCisvZcFxd6oGKGowVnz7OhP7 WG19YheTCjhcVMVLUzOlH9auZ0uqIVB/4E3qhi4VZP3FRVdTuvhQyFDJAZGjT0s8rOnS C0vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=xamYX4i3; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id j20si5334566wmc.224.2017.12.11.04.14.28; Mon, 11 Dec 2017 04:14:28 -0800 (PST) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=xamYX4i3; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 64496267590; Mon, 11 Dec 2017 13:14:27 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id B1C5726758C; Mon, 11 Dec 2017 13:14:26 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 35D9B267590 for ; Mon, 11 Dec 2017 13:14:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=M/zNVUyZ2ORzj4h3ZUenLaQff8E7zEAYUD9o7ka4EBw=; b=xamYX4i3Cqzh yyG5VUqLRmLzZulyvZNSQTd1NcqHmlhgN4K3CK8/iv1fYFP/Om3K4CVBcS8RZj+p1xsFgR/5zxtGZ DDwwGLsHZCgcFlrpBkMeLndt+qC03XGtbdSczbZjlsSG33VGYIEuL8FdfaMF+cYOPKlQ5azMc8CLJ 39kLk=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eOMyC-0002KG-US; Mon, 11 Dec 2017 12:14:04 +0000 Received: from broonie by debutante with local (Exim 4.90_RC3) (envelope-from ) id 1eOMyC-0004dm-GN; Mon, 11 Dec 2017 12:14:04 +0000 From: Mark Brown To: Dan Carpenter In-Reply-To: <20170717081605.a6merkvdy4ngdiqj@mwanda> Message-Id: Date: Mon, 11 Dec 2017 12:14:04 +0000 Cc: alsa-devel@alsa-project.org, Wan ZongShun , kernel-janitors@vger.kernel.org, Liam Girdwood , Takashi Iwai , Mark Brown Subject: [alsa-devel] Applied "ASoC: nuc900: Fix a loop timeout test" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: nuc900: Fix a loop timeout test has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 65a12b3aafed5fc59f4ce41b22b752b1729e6701 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sat, 9 Dec 2017 14:52:28 +0300 Subject: [PATCH] ASoC: nuc900: Fix a loop timeout test We should be finishing the loop with timeout set to zero but because this is a post-op we finish with timeout == -1. Fixes: 1082e2703a2d ("ASoC: NUC900/audio: add nuc900 audio driver support") Signed-off-by: Dan Carpenter Signed-off-by: Mark Brown --- sound/soc/nuc900/nuc900-ac97.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.15.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c index 71fce7c85c93..81b09d740ed9 100644 --- a/sound/soc/nuc900/nuc900-ac97.c +++ b/sound/soc/nuc900/nuc900-ac97.c @@ -67,7 +67,7 @@ static unsigned short nuc900_ac97_read(struct snd_ac97 *ac97, /* polling the AC_R_FINISH */ while (!(AUDIO_READ(nuc900_audio->mmio + ACTL_ACCON) & AC_R_FINISH) - && timeout--) + && --timeout) mdelay(1); if (!timeout) { @@ -121,7 +121,7 @@ static void nuc900_ac97_write(struct snd_ac97 *ac97, unsigned short reg, /* polling the AC_W_FINISH */ while ((AUDIO_READ(nuc900_audio->mmio + ACTL_ACCON) & AC_W_FINISH) - && timeout--) + && --timeout) mdelay(1); if (!timeout)