diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-27 11:15:44 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-27 11:15:44 -0400 |
| commit | bac0906484aec5131a927c018a8ea1e591c5d66e (patch) | |
| tree | c892faca5b668606681189144f448af11c877667 /sound/pci | |
| parent | 5530f41bd2012fed6b8eb95ed46b72c9f138ca44 (diff) | |
| parent | 395a434e39cb6dc6e1ff53bb43722b534a3c68d6 (diff) | |
Merge branch 'fix/misc' into for-linus
* fix/misc:
ALSA: Fix Trivial Warnining in sound/pci/cmipci.c
Diffstat (limited to 'sound/pci')
| -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; |