diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-02-20 10:52:50 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-02-20 10:52:50 +0300 |
commit | fc0e23fad33198fc7d74227dba7bbc3a5d7755aa (patch) | |
tree | 669319e33fb63a456986b6ac41cf3b584f583caf /sound/pci/mixart | |
parent | af677166cf63c179dc2485053166e02c4aea01eb (diff) | |
parent | 3bb9eca913025ed05c0510de831c67b7bef652c5 (diff) | |
download | linux-fc0e23fad33198fc7d74227dba7bbc3a5d7755aa.tar.xz |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/pci/mixart')
-rw-r--r-- | sound/pci/mixart/mixart.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/mixart/mixart.h b/sound/pci/mixart/mixart.h index 0cc17e0ea34a..426743871540 100644 --- a/sound/pci/mixart/mixart.h +++ b/sound/pci/mixart/mixart.h @@ -86,7 +86,7 @@ struct mixart_mgr { u32 msg_fifo[MSG_FIFO_SIZE]; int msg_fifo_readptr; int msg_fifo_writeptr; - atomic_t msg_processed; /* number of messages to be processed in takslet */ + atomic_t msg_processed; /* number of messages to be processed in tasklet */ struct mutex lock; /* interrupt lock */ struct mutex msg_lock; /* mailbox lock */ |