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

Commit 5fc51524 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai
Browse files

ALSA: oxygen: fix CD/MIDI for X-Meridian (2G) 



Enable the X-Meridian's CD input and the X-Meridian 2G's potential
MIDI ports.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e92d4575

sound/pci/oxygen/oxygen.c

+3 −0
Original line number Diff line number Diff line
@@ -695,6 +695,8 @@ static int __devinit get_oxygen_model(struct oxygen *chip, 
					    PLAYBACK_1_TO_SPDIF |

					    CAPTURE_0_FROM_I2S_2 |

					    CAPTURE_1_FROM_SPDIF;

		if (id->driver_data == MODEL_MERIDIAN)

			chip->model.device_config |= AC97_CD_INPUT;

		break;

	case MODEL_CLARO:

		chip->model.init = claro_init;
@@ -743,6 +745,7 @@ static int __devinit get_oxygen_model(struct oxygen *chip, 
		break;

	}

	if (id->driver_data == MODEL_MERIDIAN ||

	    id->driver_data == MODEL_MERIDIAN_2G ||

	    id->driver_data == MODEL_CLARO_HALO) {

		chip->model.misc_flags = OXYGEN_MISC_MIDI;

		chip->model.device_config |= MIDI_OUTPUT | MIDI_INPUT;