Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3573493pxb; Mon, 24 Jan 2022 12:33:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJzSJ0G+z59tsZdP0mMY326kATE4Vqpy95LXf01HuR5a42zaRDeHusXP6wPoU654KT4htem/ X-Received: by 2002:a17:90a:f982:: with SMTP id cq2mr97091pjb.36.1643056390041; Mon, 24 Jan 2022 12:33:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643056390; cv=none; d=google.com; s=arc-20160816; b=swDD4Z2KRCN1JSGTGgofwBRO99IWr86rEBVVrBz19+CysBidSqpZriAb98OaHJPRS1 ioQ9Z2Y5YtohfWnLrHKxeGb95mAaluhQDu55dn6kOK8qAlswzpNhXkihHOWsq8ScYB+W ShoNYK7wGnaBzVpgqOth6qn3jSbqX5oKEN5JjdhUl9vr7GewVn5CnIr8zmbe4+yyflw/ 1Xc3hUVdxaC1RO3zNfaDPIeOY60VpSACex/+9nxUuvf5d9UumCzF1tw2biNRp6At7fF2 hp29EB0IEg+0nincWmPI73wef1jC8Qf3seNoiAUeylU4ABQgEcCCNkmDH/GNzdSg8ulZ ieaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3OGxvExq0GG9imgm8TkNP/RQEaSkFANtNsy94Tt1hxU=; b=KG+QsuWzRLe8yFIMtw4IxIt+6sXzBI96ZJCB+ww6A7h8Qsn3ZpzpS5qAgSb7OAiItT ClyO0ZRaX9GTOYINLA35xxSx2s53jXwwotj85rhXo43rydtriMaD2ksSmY5RFOYO7+b2 flvKUh0QaONnQQVPDbaTjIdghyOTpuT9hYW9cmQ9ciVDwrv39LrQD+JkqAyxvWSJ2+Fp SJWZa7l7rhgzqjnQHoYrGG/QbtUK1elIJqa4sTEPLIagb3SqqJBdiQaOGwCU+Z/vN9dn 6FOIkVN81N/n2F6UUstzX4cTU6OGVvu6CY/BDcqFCmyXratBtoDFTM4tbKUSFNrAfM30 GUNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qzU3U8Wf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g24si14708211pgj.640.2022.01.24.12.32.48; Mon, 24 Jan 2022 12:33:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qzU3U8Wf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349114AbiAXTio (ORCPT + 99 others); Mon, 24 Jan 2022 14:38:44 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:60474 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347273AbiAXTdG (ORCPT ); Mon, 24 Jan 2022 14:33:06 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 065266151C; Mon, 24 Jan 2022 19:33:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6EBDC340E5; Mon, 24 Jan 2022 19:33:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643052785; bh=0G+0pkzy4Jb0WR+hX1OlBk7gQoBn53HGLdOIa5eFiBI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qzU3U8Wfwf2NTfhnRiMnHO/gCYjlI8CNDWTRA5qKnFDzlSZldlwcBwKsze/iM/iPL EY8IZhFqWoYnbjQHjHv3Rhw0F8svCktPmru5kn/GaBZtqqQ2+73LfY5h3q28t5ElVF DLa7QzkSFsusQf/a2BJXKXdb9Sgxz23Drcfv2lsw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bixuan Cui , Takashi Iwai , Sasha Levin Subject: [PATCH 5.4 130/320] ALSA: oss: fix compile error when OSS_DEBUG is enabled Date: Mon, 24 Jan 2022 19:41:54 +0100 Message-Id: <20220124183958.094301410@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124183953.750177707@linuxfoundation.org> References: <20220124183953.750177707@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bixuan Cui [ Upstream commit 8e7daf318d97f25e18b2fc7eb5909e34cd903575 ] Fix compile error when OSS_DEBUG is enabled: sound/core/oss/pcm_oss.c: In function 'snd_pcm_oss_set_trigger': sound/core/oss/pcm_oss.c:2055:10: error: 'substream' undeclared (first use in this function); did you mean 'csubstream'? pcm_dbg(substream->pcm, "pcm_oss: trigger = 0x%x\n", trigger); ^ Fixes: 61efcee8608c ("ALSA: oss: Use standard printk helpers") Signed-off-by: Bixuan Cui Link: https://lore.kernel.org/r/1638349134-110369-1-git-send-email-cuibixuan@linux.alibaba.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/core/oss/pcm_oss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index 9e31f4bd43826..841c0a12cc929 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c @@ -2055,7 +2055,7 @@ static int snd_pcm_oss_set_trigger(struct snd_pcm_oss_file *pcm_oss_file, int tr int err, cmd; #ifdef OSS_DEBUG - pcm_dbg(substream->pcm, "pcm_oss: trigger = 0x%x\n", trigger); + pr_debug("pcm_oss: trigger = 0x%x\n", trigger); #endif psubstream = pcm_oss_file->streams[SNDRV_PCM_STREAM_PLAYBACK]; -- 2.34.1