diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-08 09:35:50 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-08 09:35:50 +0100 |
| commit | a3087ae970e5c8984fab2306b1f4dbe5ef132ff7 (patch) | |
| tree | 5d9ecc2dd903ed506c58a31f1076b2df500a6fe0 /sound/pci | |
| parent | f0f20a16983f7d3713ab695e19bd15eca4e7533f (diff) | |
| parent | 2b9ddcb8b2ce6a44f0f969000f16b016caa64294 (diff) | |
| download | kernel_samsung_crespo-a3087ae970e5c8984fab2306b1f4dbe5ef132ff7.zip kernel_samsung_crespo-a3087ae970e5c8984fab2306b1f4dbe5ef132ff7.tar.gz kernel_samsung_crespo-a3087ae970e5c8984fab2306b1f4dbe5ef132ff7.tar.bz2 | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/oxygen/xonar_wm87x6.c | 2 | ||||
| -rw-r--r-- | sound/pci/riptide/riptide.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/oxygen/xonar_wm87x6.c b/sound/pci/oxygen/xonar_wm87x6.c index 7754db1..dbc4b89 100644 --- a/sound/pci/oxygen/xonar_wm87x6.c +++ b/sound/pci/oxygen/xonar_wm87x6.c @@ -68,7 +68,7 @@ static void wm8776_write(struct oxygen *chip, OXYGEN_SPI_CEN_LATCH_CLOCK_LO, (reg << 9) | value); if (reg < ARRAY_SIZE(data->wm8776_regs)) { - if (reg >= WM8776_HPLVOL || reg <= WM8776_DACMASTER) + if (reg >= WM8776_HPLVOL && reg <= WM8776_DACMASTER) value &= ~WM8776_UPDATE; data->wm8776_regs[reg] = value; } diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index 960a227..ad44626 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c @@ -1974,9 +1974,9 @@ snd_riptide_proc_read(struct snd_info_entry *entry, } snd_iprintf(buffer, "Paths:\n"); i = getpaths(cif, p); - while (i--) { - snd_iprintf(buffer, "%x->%x ", p[i - 1], p[i]); - i--; + while (i >= 2) { + i -= 2; + snd_iprintf(buffer, "%x->%x ", p[i], p[i + 1]); } snd_iprintf(buffer, "\n"); } |