diff options
| author | Alan Tull <alan.tull@freescale.com> | 2011-10-28 19:14:13 -0500 |
|---|---|---|
| committer | Eric Miao <eric.miao@canonical.com> | 2011-11-10 07:38:59 +0800 |
| commit | ba234d3c91a861e60ef92d5502c67978c4bb42a6 (patch) | |
| tree | 24b6b3452537ed93024e987f1424446275c05966 /include | |
| parent | d599326d7052787ae2c8fffdb654e21169ff746a (diff) | |
ENGR00161014 ASoC: don't clobber platform DMA driver ops
Previously, only one static struct for ops existed for all
platform DMA drivers to share. Half of the ops are shared
functions which don't have stubs in the ALSA core. The
other half are initialized to point directly to ops in the
platform driver. This creates problems where each time
soc_new_pcm is called, the new platform driver's ops would
overwrite a subset of the ops.
Signed-off-by: Alan Tull <alan.tull@freescale.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc-dai.h | 2 | ||||
| -rw-r--r-- | include/sound/soc.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 1bafe95dcf4..dc60e5e0722 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -172,6 +172,8 @@ struct snd_soc_dai_ops { struct snd_soc_dai *); int (*trigger)(struct snd_pcm_substream *, int, struct snd_soc_dai *); + int (*ioctl)(struct snd_pcm_substream *, unsigned int, void *, + struct snd_soc_dai *); /* * For hardware based FIFO caused delay reporting. * Optional. diff --git a/include/sound/soc.h b/include/sound/soc.h index 74921f20a1d..a002ae21804 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -430,6 +430,7 @@ struct snd_soc_ops { int (*hw_free)(struct snd_pcm_substream *); int (*prepare)(struct snd_pcm_substream *); int (*trigger)(struct snd_pcm_substream *, int); + int (*ioctl)(struct snd_pcm_substream *, unsigned int, void *); }; /* SoC cache ops */ @@ -693,6 +694,7 @@ struct snd_soc_pcm_runtime { struct snd_soc_dai *cpu_dai; struct delayed_work delayed_work; + struct snd_pcm_ops *ops; }; /* mixer control */ |