diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
| commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
| tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/pci/cmipci.c | |
| parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
| parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) | |
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 | |||
| 3014 | .dev_free = snd_cmipci_dev_free, | 3014 | .dev_free = snd_cmipci_dev_free, |
| 3015 | }; | 3015 | }; |
| 3016 | unsigned int val; | 3016 | unsigned int val; |
| 3017 | long iomidi; | 3017 | long iomidi = 0; |
| 3018 | int integrated_midi = 0; | 3018 | int integrated_midi = 0; |
| 3019 | char modelstr[16]; | 3019 | char modelstr[16]; |
| 3020 | int pcm_index, pcm_spdif_index; | 3020 | int pcm_index, pcm_spdif_index; |