diff options
| author | Robert P. J. Day <rpjday@mindspring.com> | 2007-02-14 00:33:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 08:09:54 -0800 |
| commit | 3159f06dc2303630c02d1ad2eeaeaf341414c9df (patch) | |
| tree | 678779f605dac635df3932381933b3950a0052ba /sound/oss/kahlua.c | |
| parent | cd354f1ae75e6466a7e31b727faede57a1f89ca5 (diff) | |
| download | linux-3.10-3159f06dc2303630c02d1ad2eeaeaf341414c9df.tar.gz linux-3.10-3159f06dc2303630c02d1ad2eeaeaf341414c9df.tar.bz2 linux-3.10-3159f06dc2303630c02d1ad2eeaeaf341414c9df.zip | |
[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/kahlua.c')
| -rw-r--r-- | sound/oss/kahlua.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c index 12e7b3038be..dfe670f12e6 100644 --- a/sound/oss/kahlua.c +++ b/sound/oss/kahlua.c @@ -139,13 +139,12 @@ static int __devinit probe_one(struct pci_dev *pdev, const struct pci_device_id printk(KERN_INFO "kahlua: XpressAudio on IRQ %d, DMA %d, %d\n", irq, dma8, dma16); - hw_config = kmalloc(sizeof(struct address_info), GFP_KERNEL); + hw_config = kzalloc(sizeof(struct address_info), GFP_KERNEL); if(hw_config == NULL) { printk(KERN_ERR "kahlua: out of memory.\n"); return 1; } - memset(hw_config, 0, sizeof(*hw_config)); pci_set_drvdata(pdev, hw_config); |