diff options
Diffstat (limited to 'sound/pci/ice1712')
-rw-r--r-- | sound/pci/ice1712/aureon.c | 2 | ||||
-rw-r--r-- | sound/pci/ice1712/ice1712.c | 2 | ||||
-rw-r--r-- | sound/pci/ice1712/ice1724.c | 2 | ||||
-rw-r--r-- | sound/pci/ice1712/juli.c | 2 | ||||
-rw-r--r-- | sound/pci/ice1712/phase.c | 4 | ||||
-rw-r--r-- | sound/pci/ice1712/pontis.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c index 4405d96cbedf..2e0a31613ee6 100644 --- a/sound/pci/ice1712/aureon.c +++ b/sound/pci/ice1712/aureon.c | |||
@@ -1796,7 +1796,7 @@ static int __devinit aureon_init(ice1712_t *ice) | |||
1796 | } | 1796 | } |
1797 | 1797 | ||
1798 | /* to remeber the register values of CS8415 */ | 1798 | /* to remeber the register values of CS8415 */ |
1799 | ice->akm = kcalloc(1, sizeof(akm4xxx_t), GFP_KERNEL); | 1799 | ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL); |
1800 | if (! ice->akm) | 1800 | if (! ice->akm) |
1801 | return -ENOMEM; | 1801 | return -ENOMEM; |
1802 | ice->akm_codecs = 1; | 1802 | ice->akm_codecs = 1; |
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index f46160531503..7d4d9b0c6b11 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -2529,7 +2529,7 @@ static int __devinit snd_ice1712_create(snd_card_t * card, | |||
2529 | return -ENXIO; | 2529 | return -ENXIO; |
2530 | } | 2530 | } |
2531 | 2531 | ||
2532 | ice = kcalloc(1, sizeof(*ice), GFP_KERNEL); | 2532 | ice = kzalloc(sizeof(*ice), GFP_KERNEL); |
2533 | if (ice == NULL) { | 2533 | if (ice == NULL) { |
2534 | pci_disable_device(pci); | 2534 | pci_disable_device(pci); |
2535 | return -ENOMEM; | 2535 | return -ENOMEM; |
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 78fc05c0800c..1e7119acfd40 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
@@ -2124,7 +2124,7 @@ static int __devinit snd_vt1724_create(snd_card_t * card, | |||
2124 | if ((err = pci_enable_device(pci)) < 0) | 2124 | if ((err = pci_enable_device(pci)) < 0) |
2125 | return err; | 2125 | return err; |
2126 | 2126 | ||
2127 | ice = kcalloc(1, sizeof(*ice), GFP_KERNEL); | 2127 | ice = kzalloc(sizeof(*ice), GFP_KERNEL); |
2128 | if (ice == NULL) { | 2128 | if (ice == NULL) { |
2129 | pci_disable_device(pci); | 2129 | pci_disable_device(pci); |
2130 | return -ENOMEM; | 2130 | return -ENOMEM; |
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c index 3fb297b969cd..2437876a44e4 100644 --- a/sound/pci/ice1712/juli.c +++ b/sound/pci/ice1712/juli.c | |||
@@ -182,7 +182,7 @@ static int __devinit juli_init(ice1712_t *ice) | |||
182 | ice->num_total_dacs = 2; | 182 | ice->num_total_dacs = 2; |
183 | ice->num_total_adcs = 2; | 183 | ice->num_total_adcs = 2; |
184 | 184 | ||
185 | ak = ice->akm = kcalloc(1, sizeof(akm4xxx_t), GFP_KERNEL); | 185 | ak = ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL); |
186 | if (! ak) | 186 | if (! ak) |
187 | return -ENOMEM; | 187 | return -ENOMEM; |
188 | ice->akm_codecs = 1; | 188 | ice->akm_codecs = 1; |
diff --git a/sound/pci/ice1712/phase.c b/sound/pci/ice1712/phase.c index 5bf734b04fa0..dcf1e8ca3f66 100644 --- a/sound/pci/ice1712/phase.c +++ b/sound/pci/ice1712/phase.c | |||
@@ -122,7 +122,7 @@ static int __devinit phase22_init(ice1712_t *ice) | |||
122 | } | 122 | } |
123 | 123 | ||
124 | // Initialize analog chips | 124 | // Initialize analog chips |
125 | ak = ice->akm = kcalloc(1, sizeof(akm4xxx_t), GFP_KERNEL); | 125 | ak = ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL); |
126 | if (! ak) | 126 | if (! ak) |
127 | return -ENOMEM; | 127 | return -ENOMEM; |
128 | ice->akm_codecs = 1; | 128 | ice->akm_codecs = 1; |
@@ -386,7 +386,7 @@ static int __devinit phase28_init(ice1712_t *ice) | |||
386 | ice->num_total_adcs = 2; | 386 | ice->num_total_adcs = 2; |
387 | 387 | ||
388 | // Initialize analog chips | 388 | // Initialize analog chips |
389 | ak = ice->akm = kcalloc(1, sizeof(akm4xxx_t), GFP_KERNEL); | 389 | ak = ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL); |
390 | if (!ak) | 390 | if (!ak) |
391 | return -ENOMEM; | 391 | return -ENOMEM; |
392 | ice->akm_codecs = 1; | 392 | ice->akm_codecs = 1; |
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c index 25f827d8fbd9..a5f852b1f575 100644 --- a/sound/pci/ice1712/pontis.c +++ b/sound/pci/ice1712/pontis.c | |||
@@ -781,7 +781,7 @@ static int __devinit pontis_init(ice1712_t *ice) | |||
781 | ice->num_total_adcs = 2; | 781 | ice->num_total_adcs = 2; |
782 | 782 | ||
783 | /* to remeber the register values */ | 783 | /* to remeber the register values */ |
784 | ice->akm = kcalloc(1, sizeof(akm4xxx_t), GFP_KERNEL); | 784 | ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL); |
785 | if (! ice->akm) | 785 | if (! ice->akm) |
786 | return -ENOMEM; | 786 | return -ENOMEM; |
787 | ice->akm_codecs = 1; | 787 | ice->akm_codecs = 1; |