aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/drivers/Kconfig2
-rw-r--r--sound/pci/trident/trident_main.c2
-rw-r--r--sound/soc/fsl/mpc8610_hpcd.c2
-rw-r--r--sound/soc/imx/imx-ssi.c2
-rw-r--r--sound/soc/soc-core.c2
-rw-r--r--sound/usb/pcm.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index 84714a65e5c..c290cee4cee 100644
--- a/sound/drivers/Kconfig
+++ b/sound/drivers/Kconfig
@@ -155,7 +155,7 @@ config SND_ML403_AC97CR
155 select SND_AC97_CODEC 155 select SND_AC97_CODEC
156 help 156 help
157 Say Y here to include support for the 157 Say Y here to include support for the
158 opb_ac97_controller_ref_v1_00_a ip core found in Xilinx' ML403 158 opb_ac97_controller_ref_v1_00_a ip core found in Xilinx's ML403
159 reference design. 159 reference design.
160 160
161 To compile this driver as a module, choose M here: the module 161 To compile this driver as a module, choose M here: the module
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index 6d943f6f6b7..2870a4fdc13 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -1055,7 +1055,7 @@ static int snd_trident_capture_prepare(struct snd_pcm_substream *substream)
1055 1055
1056 spin_lock_irq(&trident->reg_lock); 1056 spin_lock_irq(&trident->reg_lock);
1057 1057
1058 // Initilize the channel and set channel Mode 1058 // Initialize the channel and set channel Mode
1059 outb(0, TRID_REG(trident, LEGACY_DMAR15)); 1059 outb(0, TRID_REG(trident, LEGACY_DMAR15));
1060 1060
1061 // Set DMA channel operation mode register 1061 // Set DMA channel operation mode register
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index 6a2764ee820..3a501062c24 100644
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -46,7 +46,7 @@ struct mpc8610_hpcd_data {
46}; 46};
47 47
48/** 48/**
49 * mpc8610_hpcd_machine_probe: initalize the board 49 * mpc8610_hpcd_machine_probe: initialize the board
50 * 50 *
51 * This function is called when platform_device_add() is called. It is used 51 * This function is called when platform_device_add() is called. It is used
52 * to initialize the board-specific hardware. 52 * to initialize the board-specific hardware.
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c
index 80b4fee2442..4fd13d0791b 100644
--- a/sound/soc/imx/imx-ssi.c
+++ b/sound/soc/imx/imx-ssi.c
@@ -23,7 +23,7 @@
23 * between pcm data and GPIO status data changes. Our FIQ handler is not 23 * between pcm data and GPIO status data changes. Our FIQ handler is not
24 * able to handle this, hence this driver only works with 48000Hz sampling 24 * able to handle this, hence this driver only works with 48000Hz sampling
25 * rate. 25 * rate.
26 * Reading and writing AC97 registers is another challange. The core 26 * Reading and writing AC97 registers is another challenge. The core
27 * provides us status bits when the read register is updated with *another* 27 * provides us status bits when the read register is updated with *another*
28 * value. When we read the same register two times (and the register still 28 * value. When we read the same register two times (and the register still
29 * contains the same value) these status bits are not set. We work 29 * contains the same value) these status bits are not set. We work
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 998569d6033..e048e091009 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1307,7 +1307,7 @@ cpu_dai_err:
1307} 1307}
1308 1308
1309/* 1309/*
1310 * Attempt to initialise any uninitalised cards. Must be called with 1310 * Attempt to initialise any uninitialised cards. Must be called with
1311 * client_mutex. 1311 * client_mutex.
1312 */ 1312 */
1313static void snd_soc_instantiate_cards(void) 1313static void snd_soc_instantiate_cards(void)
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 456829882f4..3634cedf930 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -636,7 +636,7 @@ static int hw_rule_period_time(struct snd_pcm_hw_params *params,
636 min_datainterval = min(min_datainterval, fp->datainterval); 636 min_datainterval = min(min_datainterval, fp->datainterval);
637 } 637 }
638 if (min_datainterval == 0xff) { 638 if (min_datainterval == 0xff) {
639 hwc_debug(" --> get emtpy\n"); 639 hwc_debug(" --> get empty\n");
640 it->empty = 1; 640 it->empty = 1;
641 return -EINVAL; 641 return -EINVAL;
642 } 642 }