aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/core/init.c2
-rw-r--r--sound/core/pcm_native.c2
-rw-r--r--sound/isa/opl3sa2.c2
-rw-r--r--sound/pci/ca0106/ca0106.h2
-rw-r--r--sound/pci/emu10k1/emu10k1x.c2
-rw-r--r--sound/pci/emu10k1/p16v.h2
-rw-r--r--sound/pci/es1968.c2
-rw-r--r--sound/pci/rme9652/hdspm.c6
-rw-r--r--sound/soc/codecs/max98088.c2
-rw-r--r--sound/soc/s3c24xx/smdk_spdif.c6
10 files changed, 14 insertions, 14 deletions
diff --git a/sound/core/init.c b/sound/core/init.c
index 57b792e2439a..3e65da21a08c 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -642,7 +642,7 @@ static struct device_attribute card_number_attrs =
642 * external accesses. Thus, you should call this function at the end 642 * external accesses. Thus, you should call this function at the end
643 * of the initialization of the card. 643 * of the initialization of the card.
644 * 644 *
645 * Returns zero otherwise a negative error code if the registrain failed. 645 * Returns zero otherwise a negative error code if the registration failed.
646 */ 646 */
647int snd_card_register(struct snd_card *card) 647int snd_card_register(struct snd_card *card)
648{ 648{
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 8bc7cb3db330..8e022fc70f55 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -985,7 +985,7 @@ static int snd_pcm_do_pause(struct snd_pcm_substream *substream, int push)
985 if (push) 985 if (push)
986 snd_pcm_update_hw_ptr(substream); 986 snd_pcm_update_hw_ptr(substream);
987 /* The jiffies check in snd_pcm_update_hw_ptr*() is done by 987 /* The jiffies check in snd_pcm_update_hw_ptr*() is done by
988 * a delta betwen the current jiffies, this gives a large enough 988 * a delta between the current jiffies, this gives a large enough
989 * delta, effectively to skip the check once. 989 * delta, effectively to skip the check once.
990 */ 990 */
991 substream->runtime->hw_ptr_jiffies = jiffies - HZ * 1000; 991 substream->runtime->hw_ptr_jiffies = jiffies - HZ * 1000;
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index 265abcce9dba..9b915e27b5bd 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -264,7 +264,7 @@ static int __devinit snd_opl3sa2_detect(struct snd_card *card)
264 snd_printd("OPL3-SA [0x%lx] detect (1) = 0x%x (0x%x)\n", port, tmp, tmp1); 264 snd_printd("OPL3-SA [0x%lx] detect (1) = 0x%x (0x%x)\n", port, tmp, tmp1);
265 return -ENODEV; 265 return -ENODEV;
266 } 266 }
267 /* try if the MIC register is accesible */ 267 /* try if the MIC register is accessible */
268 tmp = snd_opl3sa2_read(chip, OPL3SA2_MIC); 268 tmp = snd_opl3sa2_read(chip, OPL3SA2_MIC);
269 snd_opl3sa2_write(chip, OPL3SA2_MIC, 0x8a); 269 snd_opl3sa2_write(chip, OPL3SA2_MIC, 0x8a);
270 if (((tmp1 = snd_opl3sa2_read(chip, OPL3SA2_MIC)) & 0x9f) != 0x8a) { 270 if (((tmp1 = snd_opl3sa2_read(chip, OPL3SA2_MIC)) & 0x9f) != 0x8a) {
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h
index f19c11077255..fc53b9bca26d 100644
--- a/sound/pci/ca0106/ca0106.h
+++ b/sound/pci/ca0106/ca0106.h
@@ -188,7 +188,7 @@
188#define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */ 188#define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */
189 /* PTR[5:0], Default: 0x0 */ 189 /* PTR[5:0], Default: 0x0 */
190#define PLAYBACK_UNKNOWN3 0x03 /* Not used ?? */ 190#define PLAYBACK_UNKNOWN3 0x03 /* Not used ?? */
191#define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA addresss */ 191#define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA address */
192 /* DMA[31:0], Default: 0x0 */ 192 /* DMA[31:0], Default: 0x0 */
193#define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size. win2000 uses 0x04000000 */ 193#define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size. win2000 uses 0x04000000 */
194 /* SIZE[31:16], Default: 0x0 */ 194 /* SIZE[31:16], Default: 0x0 */
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index df47f738098d..0c701e4ec8a5 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -114,7 +114,7 @@ MODULE_PARM_DESC(enable, "Enable the EMU10K1X soundcard.");
114 */ 114 */
115#define PLAYBACK_LIST_SIZE 0x01 /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000 */ 115#define PLAYBACK_LIST_SIZE 0x01 /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000 */
116#define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */ 116#define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */
117#define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA addresss */ 117#define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA address */
118#define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size */ 118#define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size */
119#define PLAYBACK_POINTER 0x06 /* Playback period pointer. Sample currently in DAC */ 119#define PLAYBACK_POINTER 0x06 /* Playback period pointer. Sample currently in DAC */
120#define PLAYBACK_UNKNOWN1 0x07 120#define PLAYBACK_UNKNOWN1 0x07
diff --git a/sound/pci/emu10k1/p16v.h b/sound/pci/emu10k1/p16v.h
index 153214940336..00f4817533b1 100644
--- a/sound/pci/emu10k1/p16v.h
+++ b/sound/pci/emu10k1/p16v.h
@@ -96,7 +96,7 @@
96#define PLAYBACK_LIST_SIZE 0x01 /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000 */ 96#define PLAYBACK_LIST_SIZE 0x01 /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000 */
97#define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */ 97#define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */
98#define PLAYBACK_UNKNOWN3 0x03 /* Not used */ 98#define PLAYBACK_UNKNOWN3 0x03 /* Not used */
99#define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA addresss */ 99#define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA address */
100#define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size. win2000 uses 0x04000000 */ 100#define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size. win2000 uses 0x04000000 */
101#define PLAYBACK_POINTER 0x06 /* Playback period pointer. Used with PLAYBACK_LIST_PTR to determine buffer position currently in DAC */ 101#define PLAYBACK_POINTER 0x06 /* Playback period pointer. Used with PLAYBACK_LIST_PTR to determine buffer position currently in DAC */
102#define PLAYBACK_FIFO_END_ADDRESS 0x07 /* Playback FIFO end address */ 102#define PLAYBACK_FIFO_END_ADDRESS 0x07 /* Playback FIFO end address */
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 23a58f0d6cb9..7c17f45d876d 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -220,7 +220,7 @@ MODULE_PARM_DESC(joystick, "Enable joystick.");
220#define RINGB_EN_2CODEC 0x0020 220#define RINGB_EN_2CODEC 0x0020
221#define RINGB_SING_BIT_DUAL 0x0040 221#define RINGB_SING_BIT_DUAL 0x0040
222 222
223/* ****Port Adresses**** */ 223/* ****Port Addresses**** */
224 224
225/* Write & Read */ 225/* Write & Read */
226#define ESM_INDEX 0x02 226#define ESM_INDEX 0x02
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 0c98ef9156d8..f5eadfc0672a 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -487,7 +487,7 @@ struct hdspm {
487 struct snd_kcontrol *playback_mixer_ctls[HDSPM_MAX_CHANNELS]; 487 struct snd_kcontrol *playback_mixer_ctls[HDSPM_MAX_CHANNELS];
488 /* but input to much, so not used */ 488 /* but input to much, so not used */
489 struct snd_kcontrol *input_mixer_ctls[HDSPM_MAX_CHANNELS]; 489 struct snd_kcontrol *input_mixer_ctls[HDSPM_MAX_CHANNELS];
490 /* full mixer accessable over mixer ioctl or hwdep-device */ 490 /* full mixer accessible over mixer ioctl or hwdep-device */
491 struct hdspm_mixer *mixer; 491 struct hdspm_mixer *mixer;
492 492
493}; 493};
@@ -550,7 +550,7 @@ static inline int HDSPM_bit2freq(int n)
550 return bit2freq_tab[n]; 550 return bit2freq_tab[n];
551} 551}
552 552
553/* Write/read to/from HDSPM with Adresses in Bytes 553/* Write/read to/from HDSPM with Addresses in Bytes
554 not words but only 32Bit writes are allowed */ 554 not words but only 32Bit writes are allowed */
555 555
556static inline void hdspm_write(struct hdspm * hdspm, unsigned int reg, 556static inline void hdspm_write(struct hdspm * hdspm, unsigned int reg,
@@ -2908,7 +2908,7 @@ static int snd_hdspm_create_controls(struct snd_card *card, struct hdspm * hdspm
2908 2908
2909 /* Channel playback mixer as default control 2909 /* Channel playback mixer as default control
2910 Note: the whole matrix would be 128*HDSPM_MIXER_CHANNELS Faders, 2910 Note: the whole matrix would be 128*HDSPM_MIXER_CHANNELS Faders,
2911 thats too * big for any alsamixer they are accesible via special 2911 thats too * big for any alsamixer they are accessible via special
2912 IOCTL on hwdep and the mixer 2dimensional mixer control 2912 IOCTL on hwdep and the mixer 2dimensional mixer control
2913 */ 2913 */
2914 2914
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index bc22ee93a75d..43316a70be05 100644
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -1953,7 +1953,7 @@ static int max98088_probe(struct snd_soc_codec *codec)
1953 return ret; 1953 return ret;
1954 } 1954 }
1955 1955
1956 /* initalize private data */ 1956 /* initialize private data */
1957 1957
1958 max98088->sysclk = (unsigned)-1; 1958 max98088->sysclk = (unsigned)-1;
1959 max98088->eq_textcnt = 0; 1959 max98088->eq_textcnt = 0;
diff --git a/sound/soc/s3c24xx/smdk_spdif.c b/sound/soc/s3c24xx/smdk_spdif.c
index f31d22ad7c88..11c88b13dd2e 100644
--- a/sound/soc/s3c24xx/smdk_spdif.c
+++ b/sound/soc/s3c24xx/smdk_spdif.c
@@ -61,7 +61,7 @@ static int set_audio_clock_heirachy(struct platform_device *pdev)
61 goto out3; 61 goto out3;
62 } 62 }
63 63
64 /* Set audio clock heirachy for S/PDIF */ 64 /* Set audio clock hierarchy for S/PDIF */
65 clk_set_parent(mout_epll, fout_epll); 65 clk_set_parent(mout_epll, fout_epll);
66 clk_set_parent(sclk_audio0, mout_epll); 66 clk_set_parent(sclk_audio0, mout_epll);
67 clk_set_parent(sclk_spdif, sclk_audio0); 67 clk_set_parent(sclk_spdif, sclk_audio0);
@@ -79,7 +79,7 @@ out1:
79 79
80/* We should haved to set clock directly on this part because of clock 80/* We should haved to set clock directly on this part because of clock
81 * scheme of Samsudng SoCs did not support to set rates from abstrct 81 * scheme of Samsudng SoCs did not support to set rates from abstrct
82 * clock of it's heirachy. 82 * clock of it's hierarchy.
83 */ 83 */
84static int set_audio_clock_rate(unsigned long epll_rate, 84static int set_audio_clock_rate(unsigned long epll_rate,
85 unsigned long audio_rate) 85 unsigned long audio_rate)
@@ -197,7 +197,7 @@ static int __init smdk_init(void)
197 if (ret) 197 if (ret)
198 goto err1; 198 goto err1;
199 199
200 /* Set audio clock heirachy manually */ 200 /* Set audio clock hierarchy manually */
201 ret = set_audio_clock_heirachy(smdk_snd_spdif_device); 201 ret = set_audio_clock_heirachy(smdk_snd_spdif_device);
202 if (ret) 202 if (ret)
203 goto err1; 203 goto err1;