projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/mtd-2.6
[powerpc.git]
/
sound
/
oss
/
nec_vrc5477.c
diff --git
a/sound/oss/nec_vrc5477.c
b/sound/oss/nec_vrc5477.c
index
d459bdb
..
27b4ba3
100644
(file)
--- a/
sound/oss/nec_vrc5477.c
+++ b/
sound/oss/nec_vrc5477.c
@@
-1860,11
+1860,10
@@
static int __devinit vrc5477_ac97_probe(struct pci_dev *pcidev,
if (pcidev->irq == 0)
return -1;
if (pcidev->irq == 0)
return -1;
- if (!(s = k
m
alloc(sizeof(struct vrc5477_ac97_state), GFP_KERNEL))) {
+ if (!(s = k
z
alloc(sizeof(struct vrc5477_ac97_state), GFP_KERNEL))) {
printk(KERN_ERR PFX "alloc of device struct failed\n");
return -1;
}
printk(KERN_ERR PFX "alloc of device struct failed\n");
return -1;
}
- memset(s, 0, sizeof(struct vrc5477_ac97_state));
init_waitqueue_head(&s->dma_adc.wait);
init_waitqueue_head(&s->dma_dac.wait);
init_waitqueue_head(&s->dma_adc.wait);
init_waitqueue_head(&s->dma_dac.wait);