Commit b32ae47a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: caiaq: Don't abort when no input device is available 

The previous fix to handle the error from setup_card() caused a
regression for the models that have no dedicated input device;
snd_usb_caiaq_input_init() just returns -EINVAL, and we treat it as a
fatal error although it should be ignored.

As a regression fix, change the error code to -ENODEV, and ignore this
error in the callee, to continue probing.

Fixes: 28abd224 ("ALSA: caiaq: Handle probe errors properly")
Cc: <stable@vger.kernel.org>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=221423
Link: https://patch.msgid.link/20260427145642.6637-1-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 0a7b5221

sound/usb/caiaq/device.c

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static int setup_card(struct snd_usb_caiaqdev *cdev) 


#ifdef CONFIG_SND_USB_CAIAQ_INPUT

	ret = snd_usb_caiaq_input_init(cdev);

	if (ret < 0) {

	if (ret < 0 && ret != -ENODEV) {

		dev_err(dev, "Unable to set up input system (ret=%d)\n", ret);

		return ret;

	}

sound/usb/caiaq/input.c

+1 −1
Original line number Diff line number Diff line
@@ -804,7 +804,7 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *cdev) 


	default:

		/* no input methods supported on this device */

		ret = -EINVAL;

		ret = -ENODEV;

		goto exit_free_idev;

	}