projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NET]: div64_64 consolidate (rev3)
[powerpc.git]
/
sound
/
oss
/
es1371.c
diff --git
a/sound/oss/es1371.c
b/sound/oss/es1371.c
index
ddf6b0a
..
974dd73
100644
(file)
--- a/
sound/oss/es1371.c
+++ b/
sound/oss/es1371.c
@@
-130,6
+130,8
@@
#include <linux/wait.h>
#include <linux/dma-mapping.h>
#include <linux/mutex.h>
#include <linux/wait.h>
#include <linux/dma-mapping.h>
#include <linux/mutex.h>
+#include <linux/mm.h>
+#include <linux/kernel.h>
#include <asm/io.h>
#include <asm/page.h>
#include <asm/io.h>
#include <asm/page.h>
@@
-2869,11
+2871,10
@@
static int __devinit es1371_probe(struct pci_dev *pcidev, const struct pci_devic
printk(KERN_WARNING "es1371: architecture does not support 32bit PCI busmaster DMA\n");
return i;
}
printk(KERN_WARNING "es1371: architecture does not support 32bit PCI busmaster DMA\n");
return i;
}
- if (!(s = k
m
alloc(sizeof(struct es1371_state), GFP_KERNEL))) {
+ if (!(s = k
z
alloc(sizeof(struct es1371_state), GFP_KERNEL))) {
printk(KERN_WARNING PFX "out of memory\n");
return -ENOMEM;
}
printk(KERN_WARNING PFX "out of memory\n");
return -ENOMEM;
}
- memset(s, 0, sizeof(struct es1371_state));
s->codec = ac97_alloc_codec();
if(s->codec == NULL)
s->codec = ac97_alloc_codec();
if(s->codec == NULL)
@@
-2997,7
+2998,7
@@
static int __devinit es1371_probe(struct pci_dev *pcidev, const struct pci_devic
set_fs(KERNEL_DS);
val = SOUND_MASK_LINE;
mixdev_ioctl(s->codec, SOUND_MIXER_WRITE_RECSRC, (unsigned long)&val);
set_fs(KERNEL_DS);
val = SOUND_MASK_LINE;
mixdev_ioctl(s->codec, SOUND_MIXER_WRITE_RECSRC, (unsigned long)&val);
- for (i = 0; i <
sizeof(initvol)/sizeof(initvol[0]
); i++) {
+ for (i = 0; i <
ARRAY_SIZE(initvol
); i++) {
val = initvol[i].vol;
mixdev_ioctl(s->codec, initvol[i].mixch, (unsigned long)&val);
}
val = initvol[i].vol;
mixdev_ioctl(s->codec, initvol[i].mixch, (unsigned long)&val);
}