diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-06-23 11:58:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-06-23 12:06:23 +0200 |
| commit | 3e14b50dd4a3178f4f635267a2706b5d4f8c61ee (patch) | |
| tree | 3d16b9fbd8903a084b1e174dcb4f68aed94337eb | |
| parent | ALSA: aw2 - Fix Oops at initialization (diff) | |
| download | linux-3e14b50dd4a3178f4f635267a2706b5d4f8c61ee.tar.xz linux-3e14b50dd4a3178f4f635267a2706b5d4f8c61ee.zip | |
ALSA: sb - Fix wrong assertions
snd_assert() in save_mixer() and restore_mixer() in sb_mixer.c is
just wrong. The debug code wasn't tested at all, obviously...
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/isa/sb/sb_mixer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/sb/sb_mixer.c b/sound/isa/sb/sb_mixer.c index 91d14224f6b3..73d4572d136b 100644 --- a/sound/isa/sb/sb_mixer.c +++ b/sound/isa/sb/sb_mixer.c @@ -925,7 +925,7 @@ static unsigned char als4000_saved_regs[] = { static void save_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs) { unsigned char *val = chip->saved_regs; - snd_assert(num_regs > ARRAY_SIZE(chip->saved_regs), return); + snd_assert(num_regs <= ARRAY_SIZE(chip->saved_regs), return); for (; num_regs; num_regs--) *val++ = snd_sbmixer_read(chip, *regs++); } @@ -933,7 +933,7 @@ static void save_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs) static void restore_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs) { unsigned char *val = chip->saved_regs; - snd_assert(num_regs > ARRAY_SIZE(chip->saved_regs), return); + snd_assert(num_regs <= ARRAY_SIZE(chip->saved_regs), return); for (; num_regs; num_regs--) snd_sbmixer_write(chip, *regs++, *val++); } |