diff options
| author | Kulikov Vasiliy <segooon@gmail.com> | 2010-07-15 22:48:19 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-07-16 08:30:08 +0200 |
| commit | 315e8f7501ad929acacfa94c251283e837f281ed (patch) | |
| tree | eafd010d60ce0eb5665eb14c8117bde8aa9b3112 | |
| parent | 1d8c1100fbf956b9c5994077a4d3c6490c23e087 (diff) | |
| download | talos-obmc-linux-315e8f7501ad929acacfa94c251283e837f281ed.tar.gz talos-obmc-linux-315e8f7501ad929acacfa94c251283e837f281ed.zip | |
ALSA: asihpi: fix sign bug
bytes_per_sec is unsigned, so if snd_pcm_format_width() return error we
would not see it.
Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/asihpi/asihpi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c index 91218f77217f..c80b0b863c54 100644 --- a/sound/pci/asihpi/asihpi.c +++ b/sound/pci/asihpi/asihpi.c @@ -460,6 +460,7 @@ static int snd_card_asihpi_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_card_asihpi *card = snd_pcm_substream_chip(substream); int err; u16 format; + int width; unsigned int bytes_per_sec; print_hwparams(params); @@ -512,9 +513,10 @@ static int snd_card_asihpi_pcm_hw_params(struct snd_pcm_substream *substream, dpcm->hpi_buffer_attached); } bytes_per_sec = params_rate(params) * params_channels(params); - bytes_per_sec *= snd_pcm_format_width(params_format(params)); + width = snd_pcm_format_width(params_format(params)); + bytes_per_sec *= width; bytes_per_sec /= 8; - if (bytes_per_sec <= 0) + if (width < 0 || bytes_per_sec == 0) return -EINVAL; dpcm->bytes_per_sec = bytes_per_sec; |
