Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp878684yba; Thu, 18 Apr 2019 11:05:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqw8Eonzb0OdDGCrwQOVOtb063P35W9o5XeNXnMxbl4UmSU7xF5RQrExRhoIl8NoD8aWbmpS X-Received: by 2002:a65:4489:: with SMTP id l9mr88031869pgq.1.1555610729586; Thu, 18 Apr 2019 11:05:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555610729; cv=none; d=google.com; s=arc-20160816; b=0tbaWsxPVQQ0UCOf5A6SLrMGeoVdzcEvys5WetEfG5HN4WiaLsiXRCwqwq7K3BfAdz fkKmteRutEGhHAlv83vVvZpAvLgTn2VlRdtFZLwppjvVdYU7KTbamiew18l4dw1Db51h ziMCtlQ1hrrDbFLDJWRSj2lVk3lz7WZHBPKIwySB7px/OgHlxsd1Pk9fEnm8u3xS/n24 SrUT77CAC36kkEereZ1HcWuqFviFqBb1erS1Zd/wKkB7R5soX8UAzSNoU2k6rqSFwbut lCJlI6wncf8qTD7ha6EhlIxkxdPkHJ6TKECT3XgXyBVWNrzPOuXkG7YLHG2zZQeMBmYI Qhbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BycNdkZsr1JTOUcqscC20nxPTjSBp1vK1IIYAt+0zpU=; b=tKkgo8zWG2Fn2yKssqolRnxukPC4XuW6CwAOZXMiZHVvbcEjPsC0O1emtuJPywsDnn TbXHY7FQRdm12SNdmscd3rpyWP+aAE9MIRDgZTlBt+ljdi5m96XbWkfsWSdHBIawTr3v revvnQW5Z37O2LAKj6nLfg1Nas79AKpaLBTyWTui1x6g6IIgiK5JVOmH0jFigDiOlL8z xbXU5Aath0eBsSo3s5ODlmAJl8z0nKLP+JX8RNrGCF/gFH9l1eFfGI569nIXJzQt3HNR Ik4c40ccgIg7MMiWqQCWUEYnuBeUdY+rcw+RRw0NkUnEAPmEMN+j+kju1v/XWGYW7Zrf vQ0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KTvDT4U6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 32si2621124pld.155.2019.04.18.11.05.14; Thu, 18 Apr 2019 11:05:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KTvDT4U6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390904AbfDRSDS (ORCPT + 99 others); Thu, 18 Apr 2019 14:03:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:59832 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390891AbfDRSDQ (ORCPT ); Thu, 18 Apr 2019 14:03:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 21D5421872; Thu, 18 Apr 2019 18:03:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555610595; bh=DXO0GETJ5oNnRvivMZ/ULvcZETyxG/ls+D2ui/mqmAo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KTvDT4U6BiWVLxrQfhYTXCIL3GjIXk1W+uFHILf6T5rtANfJkGJb0HX0/M3/RMEx8 WYYANkoHs0PsyxMpuYlj/UqgpIqM/pgZyzANwUIYDd62FtG1m9AdDvgB2ZJkvZhwrF pWluva2DmhpycRgbaVHtMoG6Z3wj1bnTJ4OuU0Qk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Colin Ian King , Takashi Iwai , Sasha Levin Subject: [PATCH 4.14 11/92] ALSA: opl3: fix mismatch between snd_opl3_drum_switch definition and declaration Date: Thu, 18 Apr 2019 19:56:29 +0200 Message-Id: <20190418160431.382424852@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418160430.325165109@linuxfoundation.org> References: <20190418160430.325165109@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit b4748e7ab731e436cf5db4786358ada5dd2db6dd ] The function snd_opl3_drum_switch declaration in the header file has the order of the two arguments on_off and vel swapped when compared to the definition arguments of vel and on_off. Fix this by swapping them around to match the definition. This error predates the git history, so no idea when this error was introduced. Signed-off-by: Colin Ian King Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/drivers/opl3/opl3_voice.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/drivers/opl3/opl3_voice.h b/sound/drivers/opl3/opl3_voice.h index eaef435e0528..abf6c23a721c 100644 --- a/sound/drivers/opl3/opl3_voice.h +++ b/sound/drivers/opl3/opl3_voice.h @@ -41,7 +41,7 @@ void snd_opl3_timer_func(unsigned long data); /* Prototypes for opl3_drums.c */ void snd_opl3_load_drums(struct snd_opl3 *opl3); -void snd_opl3_drum_switch(struct snd_opl3 *opl3, int note, int on_off, int vel, struct snd_midi_channel *chan); +void snd_opl3_drum_switch(struct snd_opl3 *opl3, int note, int vel, int on_off, struct snd_midi_channel *chan); /* Prototypes for opl3_oss.c */ #if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS) -- 2.19.1