diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2008-03-19 08:20:59 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 12:00:28 +0200 |
| commit | db12b8e301455cf18644aa3b765ae10869eb947c (patch) | |
| tree | a572f2ed562624cb06431b82a3ee4a19725763ad /sound/pci/oxygen/oxygen.c | |
| parent | 87eedd2fd409d5cd515ccd6fc454cef15c5fa38b (diff) | |
| download | kernel_samsung_smdk4412-db12b8e301455cf18644aa3b765ae10869eb947c.zip kernel_samsung_smdk4412-db12b8e301455cf18644aa3b765ae10869eb947c.tar.gz kernel_samsung_smdk4412-db12b8e301455cf18644aa3b765ae10869eb947c.tar.bz2 | |
[ALSA] oxygen: move MIDI flag to model struct
Put the flag that enables the MIDI port into the model structure instead
of passing it as a separate parameter to oxygen_pci_probe().
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen.c')
| -rw-r--r-- | sound/pci/oxygen/oxygen.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index e9031ed..511ef34 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c @@ -336,6 +336,7 @@ static const struct oxygen_model model_meridian = { CAPTURE_1_FROM_SPDIF | CAPTURE_2_FROM_AC97_1, .dac_channels = 8, + .misc_flags = OXYGEN_MISC_MIDI, .function_flags = OXYGEN_FUNCTION_SPI | OXYGEN_FUNCTION_ENABLE_SPI_4_5, .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, @@ -356,7 +357,7 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci, return -ENOENT; } is_meridian = pci_id->driver_data; - err = oxygen_pci_probe(pci, index[dev], id[dev], is_meridian, + err = oxygen_pci_probe(pci, index[dev], id[dev], is_meridian ? &model_meridian : &model_generic); if (err >= 0) ++dev; |