[alsa-devel] [PATCH] OSS: fix error return in dma_ioctl()
The returned error should stay negative
Signed-off-by: Roel Kluin roel.kluin@gmail.com --- 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 b69c05b..7df48a2 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;
At Thu, 12 Nov 2009 17:43:11 +0100, Roel Kluin wrote:
The returned error should stay negative
Signed-off-by: Roel Kluin roel.kluin@gmail.com
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 b69c05b..7df48a2 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;
Hmm, looks like a wrong fix to me. Here, err itself is already negative, so you don't need to flip the sign.
thanks,
Takashi
At Thu, 12 Nov 2009 18:04:53 +0100, I wrote:
At Thu, 12 Nov 2009 17:43:11 +0100, Roel Kluin wrote:
The returned error should stay negative
Signed-off-by: Roel Kluin roel.kluin@gmail.com
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 b69c05b..7df48a2 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;Hmm, looks like a wrong fix to me. Here, err itself is already negative, so you don't need to flip the sign.
My bad, I looked at the patch in a reverse way. Now applied. Thanks!
Takashi
participants (2)
-
Roel Kluin -
Takashi Iwai