diff options
Diffstat (limited to 'sound/pci/ice1712')
-rw-r--r-- | sound/pci/ice1712/aureon.c | 4 | ||||
-rw-r--r-- | sound/pci/ice1712/ice1712.c | 4 | ||||
-rw-r--r-- | sound/pci/ice1712/pontis.c | 2 | ||||
-rw-r--r-- | sound/pci/ice1712/prodigy_hifi.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c index 2f6252266a02..3e4f8c12ffce 100644 --- a/sound/pci/ice1712/aureon.c +++ b/sound/pci/ice1712/aureon.c | |||
@@ -148,7 +148,7 @@ static void aureon_pca9554_write(struct snd_ice1712 *ice, unsigned char reg, | |||
148 | udelay(100); | 148 | udelay(100); |
149 | /* | 149 | /* |
150 | * send device address, command and value, | 150 | * send device address, command and value, |
151 | * skipping ack cycles inbetween | 151 | * skipping ack cycles in between |
152 | */ | 152 | */ |
153 | for (j = 0; j < 3; j++) { | 153 | for (j = 0; j < 3; j++) { |
154 | switch (j) { | 154 | switch (j) { |
@@ -2143,7 +2143,7 @@ static int __devinit aureon_init(struct snd_ice1712 *ice) | |||
2143 | ice->num_total_adcs = 2; | 2143 | ice->num_total_adcs = 2; |
2144 | } | 2144 | } |
2145 | 2145 | ||
2146 | /* to remeber the register values of CS8415 */ | 2146 | /* to remember the register values of CS8415 */ |
2147 | ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL); | 2147 | ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL); |
2148 | if (!ice->akm) | 2148 | if (!ice->akm) |
2149 | return -ENOMEM; | 2149 | return -ENOMEM; |
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index 4fc6d8bc637e..f4594d76b6ea 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -2755,7 +2755,7 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, | |||
2755 | return err; | 2755 | return err; |
2756 | } | 2756 | } |
2757 | if (c->mpu401_1_name) | 2757 | if (c->mpu401_1_name) |
2758 | /* Prefered name available in card_info */ | 2758 | /* Preferred name available in card_info */ |
2759 | snprintf(ice->rmidi[0]->name, | 2759 | snprintf(ice->rmidi[0]->name, |
2760 | sizeof(ice->rmidi[0]->name), | 2760 | sizeof(ice->rmidi[0]->name), |
2761 | "%s %d", c->mpu401_1_name, card->number); | 2761 | "%s %d", c->mpu401_1_name, card->number); |
@@ -2772,7 +2772,7 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, | |||
2772 | return err; | 2772 | return err; |
2773 | } | 2773 | } |
2774 | if (c->mpu401_2_name) | 2774 | if (c->mpu401_2_name) |
2775 | /* Prefered name available in card_info */ | 2775 | /* Preferred name available in card_info */ |
2776 | snprintf(ice->rmidi[1]->name, | 2776 | snprintf(ice->rmidi[1]->name, |
2777 | sizeof(ice->rmidi[1]->name), | 2777 | sizeof(ice->rmidi[1]->name), |
2778 | "%s %d", c->mpu401_2_name, | 2778 | "%s %d", c->mpu401_2_name, |
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c index cdb873f5da50..92c1160d7ab5 100644 --- a/sound/pci/ice1712/pontis.c +++ b/sound/pci/ice1712/pontis.c | |||
@@ -768,7 +768,7 @@ static int __devinit pontis_init(struct snd_ice1712 *ice) | |||
768 | ice->num_total_dacs = 2; | 768 | ice->num_total_dacs = 2; |
769 | ice->num_total_adcs = 2; | 769 | ice->num_total_adcs = 2; |
770 | 770 | ||
771 | /* to remeber the register values */ | 771 | /* to remember the register values */ |
772 | ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL); | 772 | ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL); |
773 | if (! ice->akm) | 773 | if (! ice->akm) |
774 | return -ENOMEM; | 774 | return -ENOMEM; |
diff --git a/sound/pci/ice1712/prodigy_hifi.c b/sound/pci/ice1712/prodigy_hifi.c index 6a9fee3ee78f..764cc93dbca4 100644 --- a/sound/pci/ice1712/prodigy_hifi.c +++ b/sound/pci/ice1712/prodigy_hifi.c | |||
@@ -1046,7 +1046,7 @@ static int __devinit prodigy_hifi_init(struct snd_ice1712 *ice) | |||
1046 | * don't call snd_ice1712_gpio_get/put(), otherwise it's overwritten | 1046 | * don't call snd_ice1712_gpio_get/put(), otherwise it's overwritten |
1047 | */ | 1047 | */ |
1048 | ice->gpio.saved[0] = 0; | 1048 | ice->gpio.saved[0] = 0; |
1049 | /* to remeber the register values */ | 1049 | /* to remember the register values */ |
1050 | 1050 | ||
1051 | ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL); | 1051 | ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL); |
1052 | if (! ice->akm) | 1052 | if (! ice->akm) |
@@ -1128,7 +1128,7 @@ static int __devinit prodigy_hd2_init(struct snd_ice1712 *ice) | |||
1128 | * don't call snd_ice1712_gpio_get/put(), otherwise it's overwritten | 1128 | * don't call snd_ice1712_gpio_get/put(), otherwise it's overwritten |
1129 | */ | 1129 | */ |
1130 | ice->gpio.saved[0] = 0; | 1130 | ice->gpio.saved[0] = 0; |
1131 | /* to remeber the register values */ | 1131 | /* to remember the register values */ |
1132 | 1132 | ||
1133 | ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL); | 1133 | ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL); |
1134 | if (! ice->akm) | 1134 | if (! ice->akm) |