diff options
author | Takashi Iwai | 2009-05-04 16:00:16 +0200 |
---|---|---|
committer | Takashi Iwai | 2009-05-04 16:00:16 +0200 |
commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/pci/cmipci.c | |
parent | ASoC: TWL4030: Fix gain control for earpiece amplifier (diff) | |
parent | ALSA: pcm core - Avoid jiffies check for devices with BATCH flag (diff) | |
download | kernel-qcow2-linux-3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026.tar.gz kernel-qcow2-linux-3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026.tar.xz kernel-qcow2-linux-3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026.zip |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'sound/pci/cmipci.c')
-rw-r--r-- | sound/pci/cmipci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index c7899c32aba1..449fe02f666e 100644 --- a/sound/pci/cmipci.c +++ b/sound/pci/cmipci.c @@ -3014,7 +3014,7 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc .dev_free = snd_cmipci_dev_free, }; unsigned int val; - long iomidi; + long iomidi = 0; int integrated_midi = 0; char modelstr[16]; int pcm_index, pcm_spdif_index; |