aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/es1371.c
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@mindspring.com>2007-02-14 03:33:16 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-14 11:09:54 -0500
commit3159f06dc2303630c02d1ad2eeaeaf341414c9df (patch)
tree678779f605dac635df3932381933b3950a0052ba /sound/oss/es1371.c
parentcd354f1ae75e6466a7e31b727faede57a1f89ca5 (diff)
[PATCH] OSS: replace kmalloc()+memset() combos with kzalloc()
Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound/oss/es1371.c')
-rw-r--r--sound/oss/es1371.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c
index e1fbcca8e722..974dd732b149 100644
--- a/sound/oss/es1371.c
+++ b/sound/oss/es1371.c
@@ -2871,11 +2871,10 @@ static int __devinit es1371_probe(struct pci_dev *pcidev, const struct pci_devic
2871 printk(KERN_WARNING "es1371: architecture does not support 32bit PCI busmaster DMA\n"); 2871 printk(KERN_WARNING "es1371: architecture does not support 32bit PCI busmaster DMA\n");
2872 return i; 2872 return i;
2873 } 2873 }
2874 if (!(s = kmalloc(sizeof(struct es1371_state), GFP_KERNEL))) { 2874 if (!(s = kzalloc(sizeof(struct es1371_state), GFP_KERNEL))) {
2875 printk(KERN_WARNING PFX "out of memory\n"); 2875 printk(KERN_WARNING PFX "out of memory\n");
2876 return -ENOMEM; 2876 return -ENOMEM;
2877 } 2877 }
2878 memset(s, 0, sizeof(struct es1371_state));
2879 2878
2880 s->codec = ac97_alloc_codec(); 2879 s->codec = ac97_alloc_codec();
2881 if(s->codec == NULL) 2880 if(s->codec == NULL)