diff options
| author |  Takashi Iwai <tiwai@suse.de>
| 2017-11-13 15:43:04 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de>
| 2017-11-13 15:43:13 +0100 |
| commit | c429bda21ffafb28f02fb2eb4055b4ab6879ed58 (patch) | |
| tree | 80715bf534bfa3bcb69ef77cf1dc5f9d98919b44 /sound/synth/emux/emux_oss.c | |
| parent | ALSA: hda - fix headset mic problem for Dell machines with alc274 (diff) | |
| parent | ALSA: ice1712: define i2c eeprom addr to header file (diff) | |
| download | linux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.tar.gz linux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.tar.bz2 linux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.zip | |
Merge branch 'for-next' into for-linus
Pull 4.15 updates to take over the previous urgent fixes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/synth/emux/emux_oss.c')
| -rw-r--r-- | sound/synth/emux/emux_oss.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/synth/emux/emux_oss.c b/sound/synth/emux/emux_oss.c index de19e108974a..764ff4bc2089 100644 --- a/sound/synth/emux/emux_oss.c +++ b/sound/synth/emux/emux_oss.c @@ -430,7 +430,6 @@ gusspec_control(struct snd_emux *emu, struct snd_emux_port *port, int cmd, { int voice; unsigned short p1; - short p2; int plong; struct snd_midi_channel *chan; @@ -445,7 +444,6 @@ gusspec_control(struct snd_emux *emu, struct snd_emux_port *port, int cmd, chan = &port->chset.channels[voice]; p1 = *(unsigned short *) &event[4]; - p2 = *(short *) &event[6]; plong = *(int*) &event[4]; switch (cmd) { |