aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-08 05:37:58 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-08 05:37:58 -0400
commit5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c (patch)
tree2f83dc6949763e77cf6422e696dc6146684dcf4e /sound/pci
parentf2c853bca542f5ac0b036377637192a74f2091c2 (diff)
parentcaf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff)
downloadkernel_samsung_smdk4412-5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c.zip
kernel_samsung_smdk4412-5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c.tar.gz
kernel_samsung_smdk4412-5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c.tar.bz2
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/ali5451/ali5451.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index ce6c9fa..4943299 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -2249,7 +2249,7 @@ static int __devinit snd_ali_create(snd_card_t * card,
return -ENXIO;
}
- if ((codec = kcalloc(1, sizeof(*codec), GFP_KERNEL)) == NULL) {
+ if ((codec = kzalloc(sizeof(*codec), GFP_KERNEL)) == NULL) {
pci_disable_device(pci);
return -ENOMEM;
}