diff --git a/[refs] b/[refs]
index 030284d0bfab..362601d3c6d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: faa1242c59311525b0f337e95ae3c324a833a8eb
+refs/heads/master: 0d26ce3403b3841fa2656df08a819fc7eaebaa17
diff --git a/trunk/sound/oss/audio.c b/trunk/sound/oss/audio.c
index b69c05b7ea7b..7df48a25c4ee 100644
--- a/trunk/sound/oss/audio.c
+++ b/trunk/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;