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
/
es1370.c
diff --git
a/sound/oss/es1370.c
b/sound/oss/es1370.c
index
6818985
..
52cc8bf
100644
(file)
--- a/
sound/oss/es1370.c
+++ b/
sound/oss/es1370.c
@@
-573,7
+573,7
@@
static int prog_dmabuf(struct es1370_state *s, struct dmabuf *db, unsigned rate,
if (!db->rawbuf)
return -ENOMEM;
db->buforder = order;
if (!db->rawbuf)
return -ENOMEM;
db->buforder = order;
- /* 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);
@@
-1037,7
+1037,7
@@
static int es1370_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 es1370_release_mixdev(struct inode *inode, struct file *file)
}
static int es1370_release_mixdev(struct inode *inode, struct file *file)
@@
-1147,8
+1147,6
@@
static ssize_t es1370_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 (s->dma_adc.mapped)
return -ENXIO;
if (!access_ok(VERIFY_WRITE, buffer, count))
if (s->dma_adc.mapped)
return -ENXIO;
if (!access_ok(VERIFY_WRITE, buffer, count))
@@
-1225,8
+1223,6
@@
static ssize_t es1370_write(struct file *file, const char __user *buffer, size_t
int cnt;
VALIDATE_STATE(s);
int cnt;
VALIDATE_STATE(s);
- if (ppos != &file->f_pos)
- return -ESPIPE;
if (s->dma_dac2.mapped)
return -ENXIO;
if (!access_ok(VERIFY_READ, buffer, count))
if (s->dma_dac2.mapped)
return -ENXIO;
if (!access_ok(VERIFY_READ, buffer, count))
@@
-1368,7
+1364,9
@@
static int es1370_mmap(struct file *file, struct vm_area_struct *vma)
ret = -EINVAL;
goto out;
}
ret = -EINVAL;
goto out;
}
- 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)) {
ret = -EAGAIN;
goto out;
}
ret = -EAGAIN;
goto out;
}
@@
-1789,7
+1787,7
@@
static int es1370_open(struct inode *inode, struct file *file)
s->open_mode |= file->f_mode & (FMODE_READ | FMODE_WRITE);
up(&s->open_sem);
init_MUTEX(&s->sem);
s->open_mode |= file->f_mode & (FMODE_READ | FMODE_WRITE);
up(&s->open_sem);
init_MUTEX(&s->sem);
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int es1370_release(struct inode *inode, struct file *file)
}
static int es1370_release(struct inode *inode, struct file *file)
@@
-1841,8
+1839,6
@@
static ssize_t es1370_write_dac(struct file *file, const char __user *buffer, si
int cnt;
VALIDATE_STATE(s);
int cnt;
VALIDATE_STATE(s);
- if (ppos != &file->f_pos)
- return -ESPIPE;
if (s->dma_dac1.mapped)
return -ENXIO;
if (!s->dma_dac1.ready && (ret = prog_dmabuf_dac1(s)))
if (s->dma_dac1.mapped)
return -ENXIO;
if (!s->dma_dac1.ready && (ret = prog_dmabuf_dac1(s)))
@@
-1946,7
+1942,9
@@
static int es1370_mmap_dac(struct file *file, struct vm_area_struct *vma)
if (size > (PAGE_SIZE << s->dma_dac1.buforder))
goto out;
ret = -EAGAIN;
if (size > (PAGE_SIZE << s->dma_dac1.buforder))
goto out;
ret = -EAGAIN;
- if (remap_page_range(vma, vma->vm_start, virt_to_phys(s->dma_dac1.rawbuf), size, vma->vm_page_prot))
+ if (remap_pfn_range(vma, vma->vm_start,
+ virt_to_phys(s->dma_dac1.rawbuf) >> PAGE_SHIFT,
+ size, vma->vm_page_prot))
goto out;
s->dma_dac1.mapped = 1;
ret = 0;
goto out;
s->dma_dac1.mapped = 1;
ret = 0;
@@
-2222,7
+2220,7
@@
static int es1370_open_dac(struct inode *inode, struct file *file)
spin_unlock_irqrestore(&s->lock, flags);
s->open_mode |= FMODE_DAC;
up(&s->open_sem);
spin_unlock_irqrestore(&s->lock, flags);
s->open_mode |= FMODE_DAC;
up(&s->open_sem);
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int es1370_release_dac(struct inode *inode, struct file *file)
}
static int es1370_release_dac(struct inode *inode, struct file *file)
@@
-2265,8
+2263,6
@@
static ssize_t es1370_midi_read(struct file *file, char __user *buffer, size_t c
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)
@@
-2328,8
+2324,6
@@
static ssize_t es1370_midi_write(struct file *file, const char __user *buffer, s
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)
@@
-2464,7
+2458,7
@@
static int es1370_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 es1370_midi_release(struct inode *inode, struct file *file)
}
static int es1370_midi_release(struct inode *inode, struct file *file)
@@
-2531,9
+2525,9
@@
static int micbias[NR_DEVICE];
static unsigned int devindex;
static unsigned int devindex;
-
MODULE_PARM(lineout, "1-" __MODULE_STRING(NR_DEVICE) "i"
);
+
module_param_array(lineout, bool, NULL, 0
);
MODULE_PARM_DESC(lineout, "if 1 the LINE input is converted to LINE out");
MODULE_PARM_DESC(lineout, "if 1 the LINE input is converted to LINE out");
-
MODULE_PARM(micbias, "1-" __MODULE_STRING(NR_DEVICE) "i"
);
+
module_param_array(micbias, bool, NULL, 0
);
MODULE_PARM_DESC(micbias, "sets the +5V bias for an electret microphone");
MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu");
MODULE_PARM_DESC(micbias, "sets the +5V bias for an electret microphone");
MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu");