diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /sound/pci/ice1712/ak4xxx.c | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'sound/pci/ice1712/ak4xxx.c')
| -rw-r--r-- | sound/pci/ice1712/ak4xxx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/ice1712/ak4xxx.c b/sound/pci/ice1712/ak4xxx.c index dab31b2756a6..03391da8c8c7 100644 --- a/sound/pci/ice1712/ak4xxx.c +++ b/sound/pci/ice1712/ak4xxx.c | |||
| @@ -59,7 +59,8 @@ static void snd_ice1712_akm4xxx_write(struct snd_akm4xxx *ak, int chip, | |||
| 59 | struct snd_ak4xxx_private *priv = (void *)ak->private_value[0]; | 59 | struct snd_ak4xxx_private *priv = (void *)ak->private_value[0]; |
| 60 | struct snd_ice1712 *ice = ak->private_data[0]; | 60 | struct snd_ice1712 *ice = ak->private_data[0]; |
| 61 | 61 | ||
| 62 | snd_assert(chip >= 0 && chip < 4, return); | 62 | if (snd_BUG_ON(chip < 0 || chip >= 4)) |
| 63 | return; | ||
| 63 | 64 | ||
| 64 | tmp = snd_ice1712_gpio_read(ice); | 65 | tmp = snd_ice1712_gpio_read(ice); |
| 65 | tmp |= priv->add_flags; | 66 | tmp |= priv->add_flags; |