projects
/
profile
/
common
/
kernel-common.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
faa1242
)
sound: OSS: fix error return in dma_ioctl()
author
Roel Kluin
<roel.kluin@gmail.com>
Thu, 12 Nov 2009 16:43:11 +0000
(17:43 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Thu, 12 Nov 2009 20:09:45 +0000
(21:09 +0100)
The returned error should stay negative
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/oss/audio.c
patch
|
blob
|
history
diff --git
a/sound/oss/audio.c
b/sound/oss/audio.c
index
b69c05b
..
7df48a2
100644
(file)
--- a/
sound/oss/audio.c
+++ b/
sound/oss/audio.c
@@
-838,7
+838,7
@@
static int dma_ioctl(int dev, unsigned int cmd, void __user *arg)
if ((err = audio_devs[dev]->d->prepare_for_input(dev,
dmap_in->fragment_size, dmap_in->nbufs)) < 0) {
spin_unlock_irqrestore(&dmap_in->lock,flags);
- return
-
err;
+ return err;
}
dmap_in->dma_mode = DMODE_INPUT;
audio_devs[dev]->enable_bits |= PCM_ENABLE_INPUT;