diff options
Diffstat (limited to 'sound/i2c')
-rw-r--r-- | sound/i2c/cs8427.c | 2 | ||||
-rw-r--r-- | sound/i2c/i2c.c | 4 | ||||
-rw-r--r-- | sound/i2c/l3/uda1341.c | 6 | ||||
-rw-r--r-- | sound/i2c/other/ak4114.c | 2 | ||||
-rw-r--r-- | sound/i2c/other/ak4117.c | 2 | ||||
-rw-r--r-- | sound/i2c/tea6330t.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/sound/i2c/cs8427.c b/sound/i2c/cs8427.c index a3fda859dd15..a21f7d541f86 100644 --- a/sound/i2c/cs8427.c +++ b/sound/i2c/cs8427.c | |||
@@ -200,7 +200,7 @@ int snd_cs8427_create(snd_i2c_bus_t *bus, | |||
200 | 200 | ||
201 | if ((err = snd_i2c_device_create(bus, "CS8427", CS8427_ADDR | (addr & 7), &device)) < 0) | 201 | if ((err = snd_i2c_device_create(bus, "CS8427", CS8427_ADDR | (addr & 7), &device)) < 0) |
202 | return err; | 202 | return err; |
203 | chip = device->private_data = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 203 | chip = device->private_data = kzalloc(sizeof(*chip), GFP_KERNEL); |
204 | if (chip == NULL) { | 204 | if (chip == NULL) { |
205 | snd_i2c_device_free(device); | 205 | snd_i2c_device_free(device); |
206 | return -ENOMEM; | 206 | return -ENOMEM; |
diff --git a/sound/i2c/i2c.c b/sound/i2c/i2c.c index e8fa7e1a68e8..e4e505b9d88b 100644 --- a/sound/i2c/i2c.c +++ b/sound/i2c/i2c.c | |||
@@ -81,7 +81,7 @@ int snd_i2c_bus_create(snd_card_t *card, const char *name, snd_i2c_bus_t *master | |||
81 | }; | 81 | }; |
82 | 82 | ||
83 | *ri2c = NULL; | 83 | *ri2c = NULL; |
84 | bus = kcalloc(1, sizeof(*bus), GFP_KERNEL); | 84 | bus = kzalloc(sizeof(*bus), GFP_KERNEL); |
85 | if (bus == NULL) | 85 | if (bus == NULL) |
86 | return -ENOMEM; | 86 | return -ENOMEM; |
87 | init_MUTEX(&bus->lock_mutex); | 87 | init_MUTEX(&bus->lock_mutex); |
@@ -108,7 +108,7 @@ int snd_i2c_device_create(snd_i2c_bus_t *bus, const char *name, unsigned char ad | |||
108 | 108 | ||
109 | *rdevice = NULL; | 109 | *rdevice = NULL; |
110 | snd_assert(bus != NULL, return -EINVAL); | 110 | snd_assert(bus != NULL, return -EINVAL); |
111 | device = kcalloc(1, sizeof(*device), GFP_KERNEL); | 111 | device = kzalloc(sizeof(*device), GFP_KERNEL); |
112 | if (device == NULL) | 112 | if (device == NULL) |
113 | return -ENOMEM; | 113 | return -ENOMEM; |
114 | device->addr = addr; | 114 | device->addr = addr; |
diff --git a/sound/i2c/l3/uda1341.c b/sound/i2c/l3/uda1341.c index e13122f3fc50..103a7dcd0dde 100644 --- a/sound/i2c/l3/uda1341.c +++ b/sound/i2c/l3/uda1341.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * 2002-05-12 Tomas Kasparek another code cleanup | 17 | * 2002-05-12 Tomas Kasparek another code cleanup |
18 | */ | 18 | */ |
19 | 19 | ||
20 | /* $Id: uda1341.c,v 1.15 2005/01/03 12:05:20 tiwai Exp $ */ | 20 | /* $Id: uda1341.c,v 1.16 2005/09/09 13:22:34 tiwai Exp $ */ |
21 | 21 | ||
22 | #include <sound/driver.h> | 22 | #include <sound/driver.h> |
23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
@@ -670,7 +670,7 @@ int __init snd_chip_uda1341_mixer_new(snd_card_t *card, struct l3_client **clnt) | |||
670 | 670 | ||
671 | snd_assert(card != NULL, return -EINVAL); | 671 | snd_assert(card != NULL, return -EINVAL); |
672 | 672 | ||
673 | uda1341 = kcalloc(1, sizeof(*uda1341), GFP_KERNEL); | 673 | uda1341 = kzalloc(sizeof(*uda1341), GFP_KERNEL); |
674 | if (uda1341 == NULL) | 674 | if (uda1341 == NULL) |
675 | return -ENOMEM; | 675 | return -ENOMEM; |
676 | 676 | ||
@@ -707,7 +707,7 @@ static int uda1341_attach(struct l3_client *clnt) | |||
707 | { | 707 | { |
708 | struct uda1341 *uda; | 708 | struct uda1341 *uda; |
709 | 709 | ||
710 | uda = kcalloc(1, sizeof(*uda), 0, GFP_KERNEL); | 710 | uda = kzalloc(sizeof(*uda), 0, GFP_KERNEL); |
711 | if (!uda) | 711 | if (!uda) |
712 | return -ENOMEM; | 712 | return -ENOMEM; |
713 | 713 | ||
diff --git a/sound/i2c/other/ak4114.c b/sound/i2c/other/ak4114.c index 5adde308a00f..af5eadcddd92 100644 --- a/sound/i2c/other/ak4114.c +++ b/sound/i2c/other/ak4114.c | |||
@@ -92,7 +92,7 @@ int snd_ak4114_create(snd_card_t *card, | |||
92 | .dev_free = snd_ak4114_dev_free, | 92 | .dev_free = snd_ak4114_dev_free, |
93 | }; | 93 | }; |
94 | 94 | ||
95 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 95 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
96 | if (chip == NULL) | 96 | if (chip == NULL) |
97 | return -ENOMEM; | 97 | return -ENOMEM; |
98 | spin_lock_init(&chip->lock); | 98 | spin_lock_init(&chip->lock); |
diff --git a/sound/i2c/other/ak4117.c b/sound/i2c/other/ak4117.c index 0419c4336a55..d51b51dd86d6 100644 --- a/sound/i2c/other/ak4117.c +++ b/sound/i2c/other/ak4117.c | |||
@@ -83,7 +83,7 @@ int snd_ak4117_create(snd_card_t *card, ak4117_read_t *read, ak4117_write_t *wri | |||
83 | .dev_free = snd_ak4117_dev_free, | 83 | .dev_free = snd_ak4117_dev_free, |
84 | }; | 84 | }; |
85 | 85 | ||
86 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 86 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
87 | if (chip == NULL) | 87 | if (chip == NULL) |
88 | return -ENOMEM; | 88 | return -ENOMEM; |
89 | spin_lock_init(&chip->lock); | 89 | spin_lock_init(&chip->lock); |
diff --git a/sound/i2c/tea6330t.c b/sound/i2c/tea6330t.c index 2da8d7f157f4..fd65da654267 100644 --- a/sound/i2c/tea6330t.c +++ b/sound/i2c/tea6330t.c | |||
@@ -281,7 +281,7 @@ int snd_tea6330t_update_mixer(snd_card_t * card, | |||
281 | u8 default_treble, default_bass; | 281 | u8 default_treble, default_bass; |
282 | unsigned char bytes[7]; | 282 | unsigned char bytes[7]; |
283 | 283 | ||
284 | tea = kcalloc(1, sizeof(*tea), GFP_KERNEL); | 284 | tea = kzalloc(sizeof(*tea), GFP_KERNEL); |
285 | if (tea == NULL) | 285 | if (tea == NULL) |
286 | return -ENOMEM; | 286 | return -ENOMEM; |
287 | if ((err = snd_i2c_device_create(bus, "TEA6330T", TEA6330T_ADDR, &device)) < 0) { | 287 | if ((err = snd_i2c_device_create(bus, "TEA6330T", TEA6330T_ADDR, &device)) < 0) { |