diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
| commit | 012e060c95e547eceea4a12c6f58592473bf4011 (patch) | |
| tree | b57d3eafb50ce517577d2cf366c9ef0b4b286589 /sound/i2c/cs8427.c | |
| parent | 923f122573851d18a3832ca808269fa2d5046fb1 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge branch 'master'
Diffstat (limited to 'sound/i2c/cs8427.c')
| -rw-r--r-- | sound/i2c/cs8427.c | 2 |
1 files changed, 1 insertions, 1 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; |