From: Roel Kluin <12o3l@tiscali.nl>
Date: Wed, 16 Apr 2008 17:30:30 +0000 (+0200)
Subject: [ALSA] sound/drivers/dummy.c: fix negative snd_pcm_format_width() check
X-Git-Tag: v2.6.26-rc1~1087^2~39
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=369b240d6391aef41d376c9e8769fd939c7c6c4d;p=safe%2Fjmp%2Flinux-2.6

[ALSA] sound/drivers/dummy.c: fix negative snd_pcm_format_width() check

bps is unsigned, a negative snd_pcm_format_width() return value is not noticed

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index 83ac498..4e4c69e 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -230,13 +230,14 @@ static int snd_card_dummy_pcm_prepare(struct snd_pcm_substream *substream)
 {
 	struct snd_pcm_runtime *runtime = substream->runtime;
 	struct snd_dummy_pcm *dpcm = runtime->private_data;
-	unsigned int bps;
+	int bps;
+
+	bps = snd_pcm_format_width(runtime->format) * runtime->rate *
+		runtime->channels / 8;
 
-	bps = runtime->rate * runtime->channels;
-	bps *= snd_pcm_format_width(runtime->format);
-	bps /= 8;
 	if (bps <= 0)
 		return -EINVAL;
+
 	dpcm->pcm_bps = bps;
 	dpcm->pcm_hz = HZ;
 	dpcm->pcm_buffer_size = snd_pcm_lib_buffer_bytes(substream);