From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02A50C43381 for ; Sat, 30 Mar 2019 00:55:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD338218D3 for ; Sat, 30 Mar 2019 00:55:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907303; bh=acLIFq3tJxnUNKXfXEsQ2051x1tCIVT8k20i3y0vYwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=b68LWnLdYEX0FAUjoXgljfHcvHfeQehFwZinNUtiHOuCEcc+ZKpUGhtqhHtm4rdBG adUk/u8YZyQJaApB1jSbWAlemYP7RQYv+EZpq9Xr1a99wGEJHA5SXlijsul2T/SiFq ET4QtB6xPbr9ed2VtMezH/QJzS0NzpubDm35LKhI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730830AbfC3AzC (ORCPT ); Fri, 29 Mar 2019 20:55:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:34124 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731657AbfC3Ay7 (ORCPT ); Fri, 29 Mar 2019 20:54:59 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9FB562064A; Sat, 30 Mar 2019 00:54:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907299; bh=acLIFq3tJxnUNKXfXEsQ2051x1tCIVT8k20i3y0vYwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VDczfkACMi41rjpSWlYcNVFoV+xSXKJJZMiY4WSzhH705bkgTziBl1DLglXKJX9ce OmApIGUgNTQWWKfRiK9V9+/U/yPMaoXFSc0BU81z1vkuNcorGK0K0goadczOhDIZa8 Uy/JKFG/ZP7WL5IMeyw1FxPpETBW2tj31iCTMc10= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Colin Ian King , Takashi Iwai , Sasha Levin Subject: [PATCH AUTOSEL 4.14 11/37] ALSA: opl3: fix mismatch between snd_opl3_drum_switch definition and declaration Date: Fri, 29 Mar 2019 20:54:12 -0400 Message-Id: <20190330005441.27540-11-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190330005441.27540-1-sashal@kernel.org> References: <20190330005441.27540-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Colin Ian King [ 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