|
@@ -18,7 +18,7 @@
|
|
|
#include <linux/slab.h>
|
|
|
#include <linux/vmalloc.h>
|
|
|
|
|
|
-#include <asm/delay.h>
|
|
|
+#include <linux/delay.h>
|
|
|
#include <sound/core.h>
|
|
|
#include <sound/pcm.h>
|
|
|
#include <sound/pcm_params.h>
|
|
@@ -84,7 +84,6 @@ static int _tm6000_start_audio_dma(struct snd_tm6000_card *chip)
|
|
|
|
|
|
tm6000_set_audio_bitrate(core, 48000);
|
|
|
|
|
|
-
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -123,6 +122,7 @@ static int dsp_buffer_alloc(struct snd_pcm_substream *substream, int size)
|
|
|
if (substream->runtime->dma_area) {
|
|
|
if (substream->runtime->dma_bytes > size)
|
|
|
return 0;
|
|
|
+
|
|
|
dsp_buffer_free(substream);
|
|
|
}
|
|
|
|
|
@@ -152,9 +152,9 @@ static struct snd_pcm_hardware snd_tm6000_digital_hw = {
|
|
|
SNDRV_PCM_INFO_MMAP_VALID,
|
|
|
.formats = SNDRV_PCM_FMTBIT_S16_LE,
|
|
|
|
|
|
- .rates = SNDRV_PCM_RATE_CONTINUOUS,
|
|
|
- .rate_min = 48000,
|
|
|
- .rate_max = 48000,
|
|
|
+ .rates = SNDRV_PCM_RATE_CONTINUOUS,
|
|
|
+ .rate_min = 48000,
|
|
|
+ .rate_max = 48000,
|
|
|
.channels_min = 2,
|
|
|
.channels_max = 2,
|
|
|
.period_bytes_min = 64,
|
|
@@ -457,7 +457,7 @@ int tm6000_audio_init(struct tm6000_core *dev)
|
|
|
if (rc < 0)
|
|
|
goto error_chip;
|
|
|
|
|
|
- dprintk(1,"Registered audio driver for %s\n", card->longname);
|
|
|
+ dprintk(1, "Registered audio driver for %s\n", card->longname);
|
|
|
|
|
|
return 0;
|
|
|
|