Commit 1dacca7f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "ALSA: gus: add a check of the status of snd_ctl_add" 



This reverts commit 0f25e000.

Because of recent interactions with developers from @umn.edu, all
commits from them have been recently re-reviewed to ensure if they were
correct or not.

Upon review, this commit was found to be incorrect for the reasons
below, so it must be reverted.  It will be fixed up "correctly" in a
later kernel change.

The original commit did nothing if there was an error, except to print
out a message, which is pointless.  So remove the commit as it gives a
"false sense of doing something".

Cc: Kangjie Lu <kjlu@umn.edu>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20210503115736.2104747-33-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2f4a784f

sound/isa/gus/gus_main.c

+2 −11
Original line number Diff line number Diff line
@@ -77,17 +77,8 @@ static const struct snd_kcontrol_new snd_gus_joystick_control = { 


static void snd_gus_init_control(struct snd_gus_card *gus)

{

	int ret;



	if (!gus->ace_flag) {

		ret =

			snd_ctl_add(gus->card,

					snd_ctl_new1(&snd_gus_joystick_control,

						gus));

		if (ret)

			snd_printk(KERN_ERR "gus: snd_ctl_add failed: %d\n",

					ret);

	}

	if (!gus->ace_flag)

		snd_ctl_add(gus->card, snd_ctl_new1(&snd_gus_joystick_control, gus));

}



/*