diff options
Diffstat (limited to 'sound/pci/hda')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 6 | ||||
-rw-r--r-- | sound/pci/hda/hda_generic.c | 4 | ||||
-rw-r--r-- | sound/pci/hda/hda_intel.c | 2 | ||||
-rw-r--r-- | sound/pci/hda/patch_analog.c | 6 | ||||
-rw-r--r-- | sound/pci/hda/patch_cmedia.c | 2 | ||||
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 6 | ||||
-rw-r--r-- | sound/pci/hda/patch_si3054.c | 2 | ||||
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 20f7762f7144..3815403ed095 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -288,7 +288,7 @@ static int init_unsol_queue(struct hda_bus *bus) | |||
288 | { | 288 | { |
289 | struct hda_bus_unsolicited *unsol; | 289 | struct hda_bus_unsolicited *unsol; |
290 | 290 | ||
291 | unsol = kcalloc(1, sizeof(*unsol), GFP_KERNEL); | 291 | unsol = kzalloc(sizeof(*unsol), GFP_KERNEL); |
292 | if (! unsol) { | 292 | if (! unsol) { |
293 | snd_printk(KERN_ERR "hda_codec: can't allocate unsolicited queue\n"); | 293 | snd_printk(KERN_ERR "hda_codec: can't allocate unsolicited queue\n"); |
294 | return -ENOMEM; | 294 | return -ENOMEM; |
@@ -358,7 +358,7 @@ int snd_hda_bus_new(snd_card_t *card, const struct hda_bus_template *temp, | |||
358 | if (busp) | 358 | if (busp) |
359 | *busp = NULL; | 359 | *busp = NULL; |
360 | 360 | ||
361 | bus = kcalloc(1, sizeof(*bus), GFP_KERNEL); | 361 | bus = kzalloc(sizeof(*bus), GFP_KERNEL); |
362 | if (bus == NULL) { | 362 | if (bus == NULL) { |
363 | snd_printk(KERN_ERR "can't allocate struct hda_bus\n"); | 363 | snd_printk(KERN_ERR "can't allocate struct hda_bus\n"); |
364 | return -ENOMEM; | 364 | return -ENOMEM; |
@@ -493,7 +493,7 @@ int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr, | |||
493 | return -EBUSY; | 493 | return -EBUSY; |
494 | } | 494 | } |
495 | 495 | ||
496 | codec = kcalloc(1, sizeof(*codec), GFP_KERNEL); | 496 | codec = kzalloc(sizeof(*codec), GFP_KERNEL); |
497 | if (codec == NULL) { | 497 | if (codec == NULL) { |
498 | snd_printk(KERN_ERR "can't allocate struct hda_codec\n"); | 498 | snd_printk(KERN_ERR "can't allocate struct hda_codec\n"); |
499 | return -ENOMEM; | 499 | return -ENOMEM; |
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 1229227af5b5..5b829a1a4c60 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c | |||
@@ -98,7 +98,7 @@ static int add_new_node(struct hda_codec *codec, struct hda_gspec *spec, hda_nid | |||
98 | struct hda_gnode *node; | 98 | struct hda_gnode *node; |
99 | int nconns; | 99 | int nconns; |
100 | 100 | ||
101 | node = kcalloc(1, sizeof(*node), GFP_KERNEL); | 101 | node = kzalloc(sizeof(*node), GFP_KERNEL); |
102 | if (node == NULL) | 102 | if (node == NULL) |
103 | return -ENOMEM; | 103 | return -ENOMEM; |
104 | node->nid = nid; | 104 | node->nid = nid; |
@@ -886,7 +886,7 @@ int snd_hda_parse_generic_codec(struct hda_codec *codec) | |||
886 | return -ENODEV; | 886 | return -ENODEV; |
887 | } | 887 | } |
888 | 888 | ||
889 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 889 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
890 | if (spec == NULL) { | 890 | if (spec == NULL) { |
891 | printk(KERN_ERR "hda_generic: can't allocate spec\n"); | 891 | printk(KERN_ERR "hda_generic: can't allocate spec\n"); |
892 | return -ENOMEM; | 892 | return -ENOMEM; |
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index a8eaeb463b0d..7e0c05936c3e 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -1402,7 +1402,7 @@ static int __devinit azx_create(snd_card_t *card, struct pci_dev *pci, | |||
1402 | if ((err = pci_enable_device(pci)) < 0) | 1402 | if ((err = pci_enable_device(pci)) < 0) |
1403 | return err; | 1403 | return err; |
1404 | 1404 | ||
1405 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 1405 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
1406 | 1406 | ||
1407 | if (NULL == chip) { | 1407 | if (NULL == chip) { |
1408 | snd_printk(KERN_ERR SFX "cannot allocate chip\n"); | 1408 | snd_printk(KERN_ERR SFX "cannot allocate chip\n"); |
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index bceb83a42a38..da6874d3988c 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
@@ -465,7 +465,7 @@ static int patch_ad1986a(struct hda_codec *codec) | |||
465 | { | 465 | { |
466 | struct ad198x_spec *spec; | 466 | struct ad198x_spec *spec; |
467 | 467 | ||
468 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 468 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
469 | if (spec == NULL) | 469 | if (spec == NULL) |
470 | return -ENOMEM; | 470 | return -ENOMEM; |
471 | 471 | ||
@@ -623,7 +623,7 @@ static int patch_ad1983(struct hda_codec *codec) | |||
623 | { | 623 | { |
624 | struct ad198x_spec *spec; | 624 | struct ad198x_spec *spec; |
625 | 625 | ||
626 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 626 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
627 | if (spec == NULL) | 627 | if (spec == NULL) |
628 | return -ENOMEM; | 628 | return -ENOMEM; |
629 | 629 | ||
@@ -764,7 +764,7 @@ static int patch_ad1981(struct hda_codec *codec) | |||
764 | { | 764 | { |
765 | struct ad198x_spec *spec; | 765 | struct ad198x_spec *spec; |
766 | 766 | ||
767 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 767 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
768 | if (spec == NULL) | 768 | if (spec == NULL) |
769 | return -ENOMEM; | 769 | return -ENOMEM; |
770 | 770 | ||
diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c index 07fb4f5a54b3..523c362ec44d 100644 --- a/sound/pci/hda/patch_cmedia.c +++ b/sound/pci/hda/patch_cmedia.c | |||
@@ -667,7 +667,7 @@ static int patch_cmi9880(struct hda_codec *codec) | |||
667 | { | 667 | { |
668 | struct cmi_spec *spec; | 668 | struct cmi_spec *spec; |
669 | 669 | ||
670 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 670 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
671 | if (spec == NULL) | 671 | if (spec == NULL) |
672 | return -ENOMEM; | 672 | return -ENOMEM; |
673 | 673 | ||
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 45f286faa21b..849b5b50c921 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -2095,7 +2095,7 @@ static int patch_alc880(struct hda_codec *codec) | |||
2095 | int board_config; | 2095 | int board_config; |
2096 | int i, err; | 2096 | int i, err; |
2097 | 2097 | ||
2098 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 2098 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
2099 | if (spec == NULL) | 2099 | if (spec == NULL) |
2100 | return -ENOMEM; | 2100 | return -ENOMEM; |
2101 | 2101 | ||
@@ -2367,7 +2367,7 @@ static int patch_alc260(struct hda_codec *codec) | |||
2367 | struct alc_spec *spec; | 2367 | struct alc_spec *spec; |
2368 | int board_config; | 2368 | int board_config; |
2369 | 2369 | ||
2370 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 2370 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
2371 | if (spec == NULL) | 2371 | if (spec == NULL) |
2372 | return -ENOMEM; | 2372 | return -ENOMEM; |
2373 | 2373 | ||
@@ -2617,7 +2617,7 @@ static int patch_alc882(struct hda_codec *codec) | |||
2617 | { | 2617 | { |
2618 | struct alc_spec *spec; | 2618 | struct alc_spec *spec; |
2619 | 2619 | ||
2620 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 2620 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
2621 | if (spec == NULL) | 2621 | if (spec == NULL) |
2622 | return -ENOMEM; | 2622 | return -ENOMEM; |
2623 | 2623 | ||
diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c index c41fb9acdce4..d014b7bb70df 100644 --- a/sound/pci/hda/patch_si3054.c +++ b/sound/pci/hda/patch_si3054.c | |||
@@ -283,7 +283,7 @@ static struct hda_codec_ops si3054_patch_ops = { | |||
283 | 283 | ||
284 | static int patch_si3054(struct hda_codec *codec) | 284 | static int patch_si3054(struct hda_codec *codec) |
285 | { | 285 | { |
286 | struct si3054_spec *spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 286 | struct si3054_spec *spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
287 | if (spec == NULL) | 287 | if (spec == NULL) |
288 | return -ENOMEM; | 288 | return -ENOMEM; |
289 | codec->spec = spec; | 289 | codec->spec = spec; |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 9d503da7320d..33a8adaea768 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -919,7 +919,7 @@ static int patch_stac9200(struct hda_codec *codec) | |||
919 | struct sigmatel_spec *spec; | 919 | struct sigmatel_spec *spec; |
920 | int err; | 920 | int err; |
921 | 921 | ||
922 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 922 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
923 | if (spec == NULL) | 923 | if (spec == NULL) |
924 | return -ENOMEM; | 924 | return -ENOMEM; |
925 | 925 | ||
@@ -957,7 +957,7 @@ static int patch_stac922x(struct hda_codec *codec) | |||
957 | struct sigmatel_spec *spec; | 957 | struct sigmatel_spec *spec; |
958 | int err; | 958 | int err; |
959 | 959 | ||
960 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 960 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
961 | if (spec == NULL) | 961 | if (spec == NULL) |
962 | return -ENOMEM; | 962 | return -ENOMEM; |
963 | 963 | ||