git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
sound
/
oss
/
sonicvibes.c
diff --git
a/sound/oss/sonicvibes.c
b/sound/oss/sonicvibes.c
index
e231cf0
..
3b3c70f
100644
(file)
--- a/
sound/oss/sonicvibes.c
+++ b/
sound/oss/sonicvibes.c
@@
-756,7
+756,7
@@
static int prog_dmabuf(struct sv_state *s, unsigned rec)
if ((virt_to_bus(db->rawbuf) + (PAGE_SIZE << db->buforder) - 1) & ~0xffffff)
printk(KERN_DEBUG "sv: DMA buffer beyond 16MB: busaddr 0x%lx size %ld\n",
virt_to_bus(db->rawbuf), PAGE_SIZE << db->buforder);
if ((virt_to_bus(db->rawbuf) + (PAGE_SIZE << db->buforder) - 1) & ~0xffffff)
printk(KERN_DEBUG "sv: DMA buffer beyond 16MB: busaddr 0x%lx size %ld\n",
virt_to_bus(db->rawbuf), PAGE_SIZE << db->buforder);
- /* now mark the pages as reserved; otherwise remap_p
age
_range doesn't do what we want */
+ /* now mark the pages as reserved; otherwise remap_p
fn
_range doesn't do what we want */
pend = virt_to_page(db->rawbuf + (PAGE_SIZE << db->buforder) - 1);
for (page = virt_to_page(db->rawbuf); page <= pend; page++)
SetPageReserved(page);
pend = virt_to_page(db->rawbuf + (PAGE_SIZE << db->buforder) - 1);
for (page = virt_to_page(db->rawbuf); page <= pend; page++)
SetPageReserved(page);
@@
-1252,7
+1252,7
@@
static int sv_open_mixdev(struct inode *inode, struct file *file)
}
VALIDATE_STATE(s);
file->private_data = s;
}
VALIDATE_STATE(s);
file->private_data = s;
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int sv_release_mixdev(struct inode *inode, struct file *file)
}
static int sv_release_mixdev(struct inode *inode, struct file *file)
@@
-1325,8
+1325,6
@@
static ssize_t sv_read(struct file *file, char __user *buffer, size_t count, lof
int cnt;
VALIDATE_STATE(s);
int cnt;
VALIDATE_STATE(s);
- if (ppos != &file->f_pos)
- return -ESPIPE;
if (s->dma_adc.mapped)
return -ENXIO;
if (!s->dma_adc.ready && (ret = prog_dmabuf(s, 1)))
if (s->dma_adc.mapped)
return -ENXIO;
if (!s->dma_adc.ready && (ret = prog_dmabuf(s, 1)))
@@
-1410,8
+1408,6
@@
static ssize_t sv_write(struct file *file, const char __user *buffer, size_t cou
int cnt;
VALIDATE_STATE(s);
int cnt;
VALIDATE_STATE(s);
- if (ppos != &file->f_pos)
- return -ESPIPE;
if (s->dma_dac.mapped)
return -ENXIO;
if (!s->dma_dac.ready && (ret = prog_dmabuf(s, 0)))
if (s->dma_dac.mapped)
return -ENXIO;
if (!s->dma_dac.ready && (ret = prog_dmabuf(s, 0)))
@@
-1553,7
+1549,9
@@
static int sv_mmap(struct file *file, struct vm_area_struct *vma)
if (size > (PAGE_SIZE << db->buforder))
goto out;
ret = -EAGAIN;
if (size > (PAGE_SIZE << db->buforder))
goto out;
ret = -EAGAIN;
- if (remap_page_range(vma, vma->vm_start, virt_to_phys(db->rawbuf), size, vma->vm_page_prot))
+ if (remap_pfn_range(vma, vma->vm_start,
+ virt_to_phys(db->rawbuf) >> PAGE_SHIFT,
+ size, vma->vm_page_prot))
goto out;
db->mapped = 1;
ret = 0;
goto out;
db->mapped = 1;
ret = 0;
@@
-1954,7
+1952,7
@@
static int sv_open(struct inode *inode, struct file *file)
set_fmt(s, fmtm, fmts);
s->open_mode |= file->f_mode & (FMODE_READ | FMODE_WRITE);
up(&s->open_sem);
set_fmt(s, fmtm, fmts);
s->open_mode |= file->f_mode & (FMODE_READ | FMODE_WRITE);
up(&s->open_sem);
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int sv_release(struct inode *inode, struct file *file)
}
static int sv_release(struct inode *inode, struct file *file)
@@
-2005,8
+2003,6
@@
static ssize_t sv_midi_read(struct file *file, char __user *buffer, size_t count
int cnt;
VALIDATE_STATE(s);
int cnt;
VALIDATE_STATE(s);
- if (ppos != &file->f_pos)
- return -ESPIPE;
if (!access_ok(VERIFY_WRITE, buffer, count))
return -EFAULT;
if (count == 0)
if (!access_ok(VERIFY_WRITE, buffer, count))
return -EFAULT;
if (count == 0)
@@
-2068,8
+2064,6
@@
static ssize_t sv_midi_write(struct file *file, const char __user *buffer, size_
int cnt;
VALIDATE_STATE(s);
int cnt;
VALIDATE_STATE(s);
- if (ppos != &file->f_pos)
- return -ESPIPE;
if (!access_ok(VERIFY_READ, buffer, count))
return -EFAULT;
if (count == 0)
if (!access_ok(VERIFY_READ, buffer, count))
return -EFAULT;
if (count == 0)
@@
-2212,7
+2206,7
@@
static int sv_midi_open(struct inode *inode, struct file *file)
spin_unlock_irqrestore(&s->lock, flags);
s->open_mode |= (file->f_mode << FMODE_MIDI_SHIFT) & (FMODE_MIDI_READ | FMODE_MIDI_WRITE);
up(&s->open_sem);
spin_unlock_irqrestore(&s->lock, flags);
s->open_mode |= (file->f_mode << FMODE_MIDI_SHIFT) & (FMODE_MIDI_READ | FMODE_MIDI_WRITE);
up(&s->open_sem);
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int sv_midi_release(struct inode *inode, struct file *file)
}
static int sv_midi_release(struct inode *inode, struct file *file)
@@
-2414,7
+2408,7
@@
static int sv_dmfm_open(struct inode *inode, struct file *file)
outb(1, s->iosynth+3); /* enable OPL3 */
s->open_mode |= FMODE_DMFM;
up(&s->open_sem);
outb(1, s->iosynth+3); /* enable OPL3 */
s->open_mode |= FMODE_DMFM;
up(&s->open_sem);
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int sv_dmfm_release(struct inode *inode, struct file *file)
}
static int sv_dmfm_release(struct inode *inode, struct file *file)
@@
-2459,7
+2453,7
@@
static int wavetable[NR_DEVICE];
static unsigned int devindex;
static unsigned int devindex;
-
MODULE_PARM(reverb, "1-" __MODULE_STRING(NR_DEVICE) "i"
);
+
module_param_array(reverb, bool, NULL, 0
);
MODULE_PARM_DESC(reverb, "if 1 enables the reverb circuitry. NOTE: your card must have the reverb RAM");
#if 0
MODULE_PARM(wavetable, "1-" __MODULE_STRING(NR_DEVICE) "i");
MODULE_PARM_DESC(reverb, "if 1 enables the reverb circuitry. NOTE: your card must have the reverb RAM");
#if 0
MODULE_PARM(wavetable, "1-" __MODULE_STRING(NR_DEVICE) "i");
@@
-2476,7
+2470,7
@@
MODULE_LICENSE("GPL");
static struct initvol {
int mixch;
int vol;
static struct initvol {
int mixch;
int vol;
-} initvol[] __initdata = {
+} initvol[] __
dev
initdata = {
{ SOUND_MIXER_WRITE_RECLEV, 0x4040 },
{ SOUND_MIXER_WRITE_LINE1, 0x4040 },
{ SOUND_MIXER_WRITE_CD, 0x4040 },
{ SOUND_MIXER_WRITE_RECLEV, 0x4040 },
{ SOUND_MIXER_WRITE_LINE1, 0x4040 },
{ SOUND_MIXER_WRITE_CD, 0x4040 },
@@
-2493,7
+2487,7
@@
static struct initvol {
static int __devinit sv_probe(struct pci_dev *pcidev, const struct pci_device_id *pciid)
{
static int __devinit sv_probe(struct pci_dev *pcidev, const struct pci_device_id *pciid)
{
- static char __initdata sv_ddma_name[] = "S3 Inc. SonicVibes DDMA Controller";
+ static char __
dev
initdata sv_ddma_name[] = "S3 Inc. SonicVibes DDMA Controller";
struct sv_state *s;
mm_segment_t fs;
int i, val, ret;
struct sv_state *s;
mm_segment_t fs;
int i, val, ret;