summaryrefslogtreecommitdiffstats
path: root/sound/pci/mixart
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/pci/mixart
parent6c5a266029cc9b036643d08c2f9340d09ee03708 (diff)
parent5ef26e966d3fd105ad9a7e8e8f6d12c7fbd4c03d (diff)
downloadblackbird-op-linux-74be62c7cefbf320e0605f3da6639ef80448ff00.tar.gz
blackbird-op-linux-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/pci/mixart')
-rw-r--r--sound/pci/mixart/mixart_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/mixart/mixart_core.c b/sound/pci/mixart/mixart_core.c
index dccf3db48fe0..8bf2ce32d4a8 100644
--- a/sound/pci/mixart/mixart_core.c
+++ b/sound/pci/mixart/mixart_core.c
@@ -239,7 +239,7 @@ int snd_mixart_send_msg(struct mixart_mgr *mgr, struct mixart_msg *request, int
struct mixart_msg resp;
u32 msg_frame = 0; /* set to 0, so it's no notification to wait for, but the answer */
int err;
- wait_queue_t wait;
+ wait_queue_entry_t wait;
long timeout;
init_waitqueue_entry(&wait, current);
@@ -284,7 +284,7 @@ int snd_mixart_send_msg_wait_notif(struct mixart_mgr *mgr,
struct mixart_msg *request, u32 notif_event)
{
int err;
- wait_queue_t wait;
+ wait_queue_entry_t wait;
long timeout;
if (snd_BUG_ON(!notif_event))
OpenPOWER on IntegriCloud