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

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

ALSA: oxygen: simply setting of the shortname for Xonar DG cards 



We don't need to manually set the card name; with an entry in the
names[] array, this happens automatically.

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

sound/pci/oxygen/oxygen.c

+2 −4
Original line number Diff line number Diff line
@@ -767,6 +767,8 @@ static int get_oxygen_model(struct oxygen *chip, 
		[MODEL_FANTASIA]	= "TempoTec HiFier Fantasia",

		[MODEL_SERENADE]	= "TempoTec HiFier Serenade",

		[MODEL_HG2PCI]		= "CMI8787-HG2PCI",

		[MODEL_XONAR_DG]        = "Xonar DG",

		[MODEL_XONAR_DGX]       = "Xonar DGX",

	};



	chip->model = model_generic;
@@ -829,12 +831,8 @@ static int get_oxygen_model(struct oxygen *chip, 
		chip->model.dac_channels_mixer = 2;

		break;

	case MODEL_XONAR_DG:

		chip->model = model_xonar_dg;

		chip->model.shortname = "Xonar DG";

		break;

	case MODEL_XONAR_DGX:

		chip->model = model_xonar_dg;

		chip->model.shortname = "Xonar DGX";

		break;

	}

	if (id->driver_data == MODEL_MERIDIAN ||