From patchwork Wed Apr 16 14:18:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 4001951 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1FBD3BFF02 for ; Wed, 16 Apr 2014 14:19:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4662B20351 for ; Wed, 16 Apr 2014 14:19:16 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 5030220306 for ; Wed, 16 Apr 2014 14:19:15 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id C8A4126549C; Wed, 16 Apr 2014 16:19:13 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 5164326533D; Wed, 16 Apr 2014 16:19:05 +0200 (CEST) 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 C5FE3265344; Wed, 16 Apr 2014 16:19:03 +0200 (CEST) Received: from mail.tpi.com (mail.tpi.com [74.45.170.26]) by alsa0.perex.cz (Postfix) with ESMTP id 91E4C265312 for ; Wed, 16 Apr 2014 16:18:56 +0200 (CEST) Received: from salmon.rtg.net (mail.tpi.com [10.0.0.205]) by mail.tpi.com (Postfix) with ESMTP id 7FE3B352471; Wed, 16 Apr 2014 07:18:55 -0700 (PDT) Received: by salmon.rtg.net (Postfix, from userid 1000) id 3722F246A0; Wed, 16 Apr 2014 08:18:53 -0600 (MDT) From: Tim Gardner To: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Date: Wed, 16 Apr 2014 08:18:35 -0600 Message-Id: <1397657915-5036-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.7.9.5 Cc: Lars-Peter Clausen , Mark Brown , Takashi Iwai , JongHo Kim , Tim Gardner Subject: [alsa-devel] [PATCH v2 linux-next] ALSA: pcm: 'BUG:' message unnecessarily triggers kerneloops 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 X-Virus-Scanned: ClamAV using ClamSMTP BugLink: http://bugs.launchpad.net/bugs/1305480 The kerneloops-daemon scans dmesg for common crash signatures, among which is 'BUG:'. The message emitted by the PCM library is really a warning, so the most expedient thing to do seems to be to change the string. Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: Mark Brown Cc: Lars-Peter Clausen Cc: JongHo Kim Signed-off-by: Tim Gardner --- v2: Changed string preface from "OVER RUN" to "XRUN". As Takashi pointed out, 'Use a term "XRUN", as it's not always an overrun.' sound/core/pcm_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index ce83def..9acc77e 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -345,7 +345,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, snd_pcm_debug_name(substream, name, sizeof(name)); xrun_log_show(substream); pcm_err(substream->pcm, - "BUG: %s, pos = %ld, buffer size = %ld, period size = %ld\n", + "XRUN: %s, pos = %ld, buffer size = %ld, period size = %ld\n", name, pos, runtime->buffer_size, runtime->period_size); }