summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-01-24 16:46:17 +0300
committerTakashi Iwai <tiwai@suse.de>2019-01-24 16:46:21 +0300
commit205d6bcf9bb896903248cd8d600f23cf4d3886d2 (patch)
tree65ec0a60aab07058a190c29d669578ee4fe60d37 /include/sound
parent3a55437141a1d287dead685b37fe240185144f15 (diff)
parentef2056b8f3945c78cc5a3a3ba7592e18a757ffd9 (diff)
downloadlinux-205d6bcf9bb896903248cd8d600f23cf4d3886d2.tar.xz
Merge branch 'topic/pcm-lock-refactor' into for-next
Pull PCM lock refactoring. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/pcm.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index eae6d2b82d7a..ca20f80f8976 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -30,6 +30,7 @@
#include <linux/mm.h>
#include <linux/bitops.h>
#include <linux/pm_qos.h>
+#include <linux/refcount.h>
#define snd_pcm_substream_chip(substream) ((substream)->private_data)
#define snd_pcm_chip(pcm) ((pcm)->private_data)
@@ -439,7 +440,7 @@ struct snd_pcm_group { /* keep linked substreams */
spinlock_t lock;
struct mutex mutex;
struct list_head substreams;
- int count;
+ refcount_t refs;
};
struct pid;