Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: sb - Fix wrong assertions
ALSA: aw2 - Fix Oops at initialization
+2
-2
sound/isa/sb/sb_mixer.c
+2
-2
sound/isa/sb/sb_mixer.c
···
925
925
static void save_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs)
926
926
{
927
927
unsigned char *val = chip->saved_regs;
928
-
snd_assert(num_regs > ARRAY_SIZE(chip->saved_regs), return);
928
+
snd_assert(num_regs <= ARRAY_SIZE(chip->saved_regs), return);
929
929
for (; num_regs; num_regs--)
930
930
*val++ = snd_sbmixer_read(chip, *regs++);
931
931
}
···
933
933
static void restore_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs)
934
934
{
935
935
unsigned char *val = chip->saved_regs;
936
-
snd_assert(num_regs > ARRAY_SIZE(chip->saved_regs), return);
936
+
snd_assert(num_regs <= ARRAY_SIZE(chip->saved_regs), return);
937
937
for (; num_regs; num_regs--)
938
938
snd_sbmixer_write(chip, *regs++, *val++);
939
939
}
+2
-2
sound/pci/aw2/aw2-alsa.c
+2
-2
sound/pci/aw2/aw2-alsa.c
···
316
316
return -ENOMEM;
317
317
}
318
318
319
+
/* (2) initialization of the chip hardware */
320
+
snd_aw2_saa7146_setup(&chip->saa7146, chip->iobase_virt);
319
321
320
322
if (request_irq(pci->irq, snd_aw2_saa7146_interrupt,
321
323
IRQF_SHARED, "Audiowerk2", chip)) {
···
331
329
}
332
330
chip->irq = pci->irq;
333
331
334
-
/* (2) initialization of the chip hardware */
335
-
snd_aw2_saa7146_setup(&chip->saa7146, chip->iobase_virt);
336
332
err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
337
333
if (err < 0) {
338
334
free_irq(chip->irq, (void *)chip);