lkml.org 
[lkml]   [2019]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.0 17/67] ALSA: opl3: fix mismatch between snd_opl3_drum_switch definition and declaration
    Date
    From: Colin Ian King <colin.king@canonical.com>

    [ 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 <colin.king@canonical.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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
    \
     
     \ /
      Last update: 2019-03-30 01:51    [W:4.058 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site