diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 19:09:02 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 19:09:02 +0300 |
| commit | 8f0cb147b2fb12427bf6abef7fed2b604557a41e (patch) | |
| tree | fb5ba437ee74b900fab9686c8c7df18abcd7640b /sound/pci/emu10k1/emupcm.c | |
| parent | 8e33ba49765484bc6de3a2f8143733713fa93bc1 (diff) | |
| parent | b00e8443c3eece823052d06ae1c7cb797ab0ddf5 (diff) | |
| download | linux-8f0cb147b2fb12427bf6abef7fed2b604557a41e.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/pci/emu10k1/emupcm.c')
| -rw-r--r-- | sound/pci/emu10k1/emupcm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index 66ba27afe962..bf7490dae09b 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c @@ -965,7 +965,8 @@ static void snd_emu10k1_pcm_mixer_notify1(emu10k1_t *emu, snd_kcontrol_t *kctl, { snd_ctl_elem_id_t id; - snd_runtime_check(kctl != NULL, return); + if (! kctl) + return; if (activate) kctl->vd[idx].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE; else |