diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:37 +0100 |
| commit | 57648cd52b1848c6885bdbd948d113d52f3ddd43 (patch) | |
| tree | 218c74fde12577ea22f51eabcf4e8b65273edb54 /sound/oss/audio.c | |
| parent | 79598324838a25cc378ecbb8c29dd1e3d3951d35 (diff) | |
| parent | fb716c0b7bed36064cd41d800c8f339f41adf084 (diff) | |
| download | lwn-57648cd52b1848c6885bdbd948d113d52f3ddd43.tar.gz lwn-57648cd52b1848c6885bdbd948d113d52f3ddd43.zip | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/oss/audio.c')
| -rw-r--r-- | sound/oss/audio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/audio.c b/sound/oss/audio.c index b69c05b7ea7b..7df48a25c4ee 100644 --- 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; |