Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd93dc8c authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela
Browse files

[ALSA] oxygen: remove MIDI for generic cards 



None of the reference design models have MIDI, only the X-Meridian
allows to connect a MIDI adapter.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 33c646e4

sound/pci/oxygen/oxygen.c

+4 −3
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci, 
					  const struct pci_device_id *pci_id)

{

	static int dev;

	const struct oxygen_model *model;

	int is_meridian;

	int err;



	if (dev >= SNDRV_CARDS)
@@ -395,8 +395,9 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci, 
		++dev;

		return -ENOENT;

	}

	model = pci_id->driver_data ? &model_meridian : &model_generic;

	err = oxygen_pci_probe(pci, index[dev], id[dev], 1, model);

	is_meridian = pci_id->driver_data;

	err = oxygen_pci_probe(pci, index[dev], id[dev], is_meridian,

			       is_meridian ? &model_meridian : &model_generic);

	if (err >= 0)

		++dev;

	return err;