diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2007-08-13 11:37:55 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-16 09:58:52 -0400 |
| commit | b83f346bc4d6ab358fd0da85b7eab08bf0234c0b (patch) | |
| tree | 4e4d033bcba71b343e96e1063d6b5f8f88175f7a /sound/pci/cs4281.c | |
| parent | f9ff161a14baca1a4ead5f12377ab25b9dd332e1 (diff) | |
[ALSA] remove incorrect usage of SNDRV_PCM_INFO_SYNC_START and snd_pcm_set_sync()
Set the SNDRV_PCM_INFO_SYNC_START flag and the substream's sync ID
(only) if the substream actually can be linked to another one.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/cs4281.c')
| -rw-r--r-- | sound/pci/cs4281.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index 44cf54607647..1fca49a1641a 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c | |||
| @@ -842,12 +842,11 @@ static snd_pcm_uframes_t snd_cs4281_pointer(struct snd_pcm_substream *substream) | |||
| 842 | 842 | ||
| 843 | static struct snd_pcm_hardware snd_cs4281_playback = | 843 | static struct snd_pcm_hardware snd_cs4281_playback = |
| 844 | { | 844 | { |
| 845 | .info = (SNDRV_PCM_INFO_MMAP | | 845 | .info = SNDRV_PCM_INFO_MMAP | |
| 846 | SNDRV_PCM_INFO_INTERLEAVED | | 846 | SNDRV_PCM_INFO_INTERLEAVED | |
| 847 | SNDRV_PCM_INFO_MMAP_VALID | | 847 | SNDRV_PCM_INFO_MMAP_VALID | |
| 848 | SNDRV_PCM_INFO_PAUSE | | 848 | SNDRV_PCM_INFO_PAUSE | |
| 849 | SNDRV_PCM_INFO_RESUME | | 849 | SNDRV_PCM_INFO_RESUME, |
| 850 | SNDRV_PCM_INFO_SYNC_START), | ||
| 851 | .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S8 | | 850 | .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S8 | |
| 852 | SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_S16_LE | | 851 | SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_S16_LE | |
| 853 | SNDRV_PCM_FMTBIT_U16_BE | SNDRV_PCM_FMTBIT_S16_BE | | 852 | SNDRV_PCM_FMTBIT_U16_BE | SNDRV_PCM_FMTBIT_S16_BE | |
| @@ -868,12 +867,11 @@ static struct snd_pcm_hardware snd_cs4281_playback = | |||
| 868 | 867 | ||
| 869 | static struct snd_pcm_hardware snd_cs4281_capture = | 868 | static struct snd_pcm_hardware snd_cs4281_capture = |
| 870 | { | 869 | { |
| 871 | .info = (SNDRV_PCM_INFO_MMAP | | 870 | .info = SNDRV_PCM_INFO_MMAP | |
| 872 | SNDRV_PCM_INFO_INTERLEAVED | | 871 | SNDRV_PCM_INFO_INTERLEAVED | |
| 873 | SNDRV_PCM_INFO_MMAP_VALID | | 872 | SNDRV_PCM_INFO_MMAP_VALID | |
| 874 | SNDRV_PCM_INFO_PAUSE | | 873 | SNDRV_PCM_INFO_PAUSE | |
| 875 | SNDRV_PCM_INFO_RESUME | | 874 | SNDRV_PCM_INFO_RESUME, |
| 876 | SNDRV_PCM_INFO_SYNC_START), | ||
| 877 | .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S8 | | 875 | .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S8 | |
| 878 | SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_S16_LE | | 876 | SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_S16_LE | |
| 879 | SNDRV_PCM_FMTBIT_U16_BE | SNDRV_PCM_FMTBIT_S16_BE | | 877 | SNDRV_PCM_FMTBIT_U16_BE | SNDRV_PCM_FMTBIT_S16_BE | |
| @@ -904,7 +902,6 @@ static int snd_cs4281_playback_open(struct snd_pcm_substream *substream) | |||
| 904 | dma->right_slot = 1; | 902 | dma->right_slot = 1; |
| 905 | runtime->private_data = dma; | 903 | runtime->private_data = dma; |
| 906 | runtime->hw = snd_cs4281_playback; | 904 | runtime->hw = snd_cs4281_playback; |
| 907 | snd_pcm_set_sync(substream); | ||
| 908 | /* should be detected from the AC'97 layer, but it seems | 905 | /* should be detected from the AC'97 layer, but it seems |
| 909 | that although CS4297A rev B reports 18-bit ADC resolution, | 906 | that although CS4297A rev B reports 18-bit ADC resolution, |
| 910 | samples are 20-bit */ | 907 | samples are 20-bit */ |
| @@ -924,7 +921,6 @@ static int snd_cs4281_capture_open(struct snd_pcm_substream *substream) | |||
| 924 | dma->right_slot = 11; | 921 | dma->right_slot = 11; |
| 925 | runtime->private_data = dma; | 922 | runtime->private_data = dma; |
| 926 | runtime->hw = snd_cs4281_capture; | 923 | runtime->hw = snd_cs4281_capture; |
| 927 | snd_pcm_set_sync(substream); | ||
| 928 | /* should be detected from the AC'97 layer, but it seems | 924 | /* should be detected from the AC'97 layer, but it seems |
| 929 | that although CS4297A rev B reports 18-bit ADC resolution, | 925 | that although CS4297A rev B reports 18-bit ADC resolution, |
| 930 | samples are 20-bit */ | 926 | samples are 20-bit */ |