summaryrefslogtreecommitdiffstats
path: root/sound/isa
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-08-04 16:49:38 +0200
committerTakashi Iwai <tiwai@suse.de>2017-08-04 16:50:18 +0200
commit74be62c7cefbf320e0605f3da6639ef80448ff00 (patch)
treeea45fa2e0b343b792a03a66058b26a8d3e736787 /sound/isa
parent6c5a266029cc9b036643d08c2f9340d09ee03708 (diff)
parent5ef26e966d3fd105ad9a7e8e8f6d12c7fbd4c03d (diff)
downloadlinux-stable-74be62c7cefbf320e0605f3da6639ef80448ff00.tar.gz
linux-stable-74be62c7cefbf320e0605f3da6639ef80448ff00.tar.bz2
linux-stable-74be62c7cefbf320e0605f3da6639ef80448ff00.zip
Merge branch 'for-linus' into for-next
Back-merge 4.13-rc devel branch for later development. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa')
-rw-r--r--sound/isa/wavefront/wavefront_synth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c
index 4dae9ff9ef5a..0b1e4b34b299 100644
--- a/sound/isa/wavefront/wavefront_synth.c
+++ b/sound/isa/wavefront/wavefront_synth.c
@@ -1782,7 +1782,7 @@ wavefront_should_cause_interrupt (snd_wavefront_t *dev,
int val, int port, unsigned long timeout)
{
- wait_queue_t wait;
+ wait_queue_entry_t wait;
init_waitqueue_entry(&wait, current);
spin_lock_irq(&dev->irq_lock);