Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp885607yba; Thu, 18 Apr 2019 11:11:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqy7D2jQWEi0+ncMBBO0CHJJS+TbjrpVtmikUh77eomqVpLua8lhYk0FGMrfxd4cN6bLvGMb X-Received: by 2002:a65:4342:: with SMTP id k2mr10252429pgq.178.1555611105469; Thu, 18 Apr 2019 11:11:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555611105; cv=none; d=google.com; s=arc-20160816; b=M8vVq8Zb+oJ0o+ZJ5Etu1ey83SDZwehDj7RLzrrwgudsCn97Z4PgQqGBvUuFJWrXG1 1D+5Qh6owbLwU0IuYsjM7Wqe+Ld5RhmFp/n1xVTC2pwNiL4b5gaWbJ4fGMgxXl/vvLPI JwouffuVH2LPINlbvIqxpYkWE4PrZb1Ilhfy9YJPN2vlLOIxyWPMHs/W4t79S3EIujJ6 fDVLQxZ9ZNIeVc4XA+gt1fjh0RPugMCBsCQEDi7cTcireNe6DVYZBbkss7aoMkqvtsnp MbfpUm93ZeMgkJmxjTdpYDSftWyQY4wFH/gG5C0LJ1pLbWbFzeM35c5uF4V4vv9+e7qv jtcw== 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=L0uDgMMTiU7huVR0LDBQC5fVgfoLK4di/FdeI13N2Rk=; b=AQ4T4i/vjE93CQESz7oHr0/kVKdq5fBf45FQiayphSCfieMKwE7dyVV+lSbLZe9E/P 27IMR956eyH5NfW+6oqTPUkg01OWiCFxbPY57wb8SUkYEa+fPFCi+7E/k0mRhbk+SnVW OVMSKY9nhVPjR0iUJ5+dMcYmwjTBp3bTSv97xg/kKNmQirbvZ+I7OvNs0V2KKsQqKI8P qY6PHHZnKj4CIAY8EcmFKEVhwS6PpW2nwTYse2a88VORILzsBu39ZssFmtflLFnHuIRk ZbOwkV190Rry0XbSLl92qV/nJ87FqRjx5ORGXQb1TKm9VsPosiaY3shGstHoMhN1SB4A qNBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=M2+naC0o; 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 f63si3095965pfa.154.2019.04.18.11.11.30; Thu, 18 Apr 2019 11:11:45 -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=M2+naC0o; 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 S2403989AbfDRSJx (ORCPT + 99 others); Thu, 18 Apr 2019 14:09:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:41522 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403796AbfDRSJu (ORCPT ); Thu, 18 Apr 2019 14:09:50 -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 AAEB820675; Thu, 18 Apr 2019 18:09:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555610990; bh=gt3BloQFJzLlyAUC1GyOGGq9HIpGz+T3aP1dH+xtdQM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M2+naC0oMK+6FBPuO+8EydgMrR6zbdbu25C9YMqtIpp4I0fmWSrVRpLmJOb+oUwbD TB3arsLSz2s7alMpsLARPtsy0zl8+DE8V4Tw2a2gVW6zJAybNlsNoqv5p0c+PXAu5a EqA7hs+xuTvbOF3fGmEaL15RSfCaOZbbR2MG85ds= 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 5.0 17/93] ALSA: opl3: fix mismatch between snd_opl3_drum_switch definition and declaration Date: Thu, 18 Apr 2019 19:56:55 +0200 Message-Id: <20190418160438.588122787@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418160436.781762249@linuxfoundation.org> References: <20190418160436.781762249@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 5b02bd49fde4..4e4ecc21760b 100644 --- a/sound/drivers/opl3/opl3_voice.h +++ b/sound/drivers/opl3/opl3_voice.h @@ -41,7 +41,7 @@ void snd_opl3_timer_func(struct timer_list *t); /* 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