xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'topic/snd-device' into for-next

Browse Source
This commit is contained in:
Takashi Iwai
2015-02-03 17:57:16 +01:00
parent 6ccd93bdb9 830953c072
commit 3fe9cf390f
238 changed files with 2633 additions and 1600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/pcm.h
View File

@@ -447,6 +447,7 @@ struct snd_pcm_str {
#endif
#endif
struct snd_kcontrol *chmap_kctl; /* channel-mapping controls */
struct device dev;
};
struct snd_pcm {
@@ -463,7 +464,6 @@ struct snd_pcm {
wait_queue_head_t open_wait;
void *private_data;
void (*private_free) (struct snd_pcm *pcm);
struct device *dev; /* actual hw device this belongs to */
bool internal; /* pcm is for internal use only */
bool nonatomic; /* whole PCM operations are in non-atomic context */
#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)