projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[cascardo/linux.git]
/
sound
/
oss
/
soundcard.c
diff --git
a/sound/oss/soundcard.c
b/sound/oss/soundcard.c
index
e778034
..
b70c7c8
100644
(file)
--- a/
sound/oss/soundcard.c
+++ b/
sound/oss/soundcard.c
@@
-154,7
+154,6
@@
static ssize_t sound_read(struct file *file, char __user *buf, size_t count, lof
mutex_lock(&soundcard_mutex);
mutex_lock(&soundcard_mutex);
- DEB(printk("sound_read(dev=%d, count=%d)\n", dev, count));
switch (dev & 0x0f) {
case SND_DEV_DSP:
case SND_DEV_DSP16:
switch (dev & 0x0f) {
case SND_DEV_DSP:
case SND_DEV_DSP16:
@@
-180,7
+179,6
@@
static ssize_t sound_write(struct file *file, const char __user *buf, size_t cou
int ret = -EINVAL;
mutex_lock(&soundcard_mutex);
int ret = -EINVAL;
mutex_lock(&soundcard_mutex);
- DEB(printk("sound_write(dev=%d, count=%d)\n", dev, count));
switch (dev & 0x0f) {
case SND_DEV_SEQ:
case SND_DEV_SEQ2:
switch (dev & 0x0f) {
case SND_DEV_SEQ:
case SND_DEV_SEQ2:
@@
-206,7
+204,6
@@
static int sound_open(struct inode *inode, struct file *file)
int dev = iminor(inode);
int retval;
int dev = iminor(inode);
int retval;
- DEB(printk("sound_open(dev=%d)\n", dev));
if ((dev >= SND_NDEVS) || (dev < 0)) {
printk(KERN_ERR "Invalid minor device %d\n", dev);
return -ENXIO;
if ((dev >= SND_NDEVS) || (dev < 0)) {
printk(KERN_ERR "Invalid minor device %d\n", dev);
return -ENXIO;
@@
-257,7
+254,6
@@
static int sound_release(struct inode *inode, struct file *file)
int dev = iminor(inode);
mutex_lock(&soundcard_mutex);
int dev = iminor(inode);
mutex_lock(&soundcard_mutex);
- DEB(printk("sound_release(dev=%d)\n", dev));
switch (dev & 0x0f) {
case SND_DEV_CTL:
module_put(mixer_devs[dev >> 4]->owner);
switch (dev & 0x0f) {
case SND_DEV_CTL:
module_put(mixer_devs[dev >> 4]->owner);
@@
-351,7
+347,6
@@
static long sound_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
if (!access_ok(VERIFY_WRITE, p, len))
return -EFAULT;
}
if (!access_ok(VERIFY_WRITE, p, len))
return -EFAULT;
}
- DEB(printk("sound_ioctl(dev=%d, cmd=0x%x, arg=0x%x)\n", dev, cmd, arg));
if (cmd == OSS_GETVERSION)
return __put_user(SOUND_VERSION, (int __user *)p);
if (cmd == OSS_GETVERSION)
return __put_user(SOUND_VERSION, (int __user *)p);
@@
-409,7
+404,6
@@
static unsigned int sound_poll(struct file *file, poll_table * wait)
struct inode *inode = file_inode(file);
int dev = iminor(inode);
struct inode *inode = file_inode(file);
int dev = iminor(inode);
- DEB(printk("sound_poll(dev=%d)\n", dev));
switch (dev & 0x0f) {
case SND_DEV_SEQ:
case SND_DEV_SEQ2:
switch (dev & 0x0f) {
case SND_DEV_SEQ:
case SND_DEV_SEQ2: