Skip to content

Commit e4389fb

Browse files
tiwaigregkh
authored andcommitted
ALSA: caiaq: Don't abort when no input device is available
commit b32ae47 upstream. 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: 28abd22 ("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: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent be62c8b commit e4389fb

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

sound/usb/caiaq/device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ static int setup_card(struct snd_usb_caiaqdev *cdev)
366366

367367
#ifdef CONFIG_SND_USB_CAIAQ_INPUT
368368
ret = snd_usb_caiaq_input_init(cdev);
369-
if (ret < 0) {
369+
if (ret < 0 && ret != -ENODEV) {
370370
dev_err(dev, "Unable to set up input system (ret=%d)\n", ret);
371371
return ret;
372372
}

sound/usb/caiaq/input.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *cdev)
804804

805805
default:
806806
/* no input methods supported on this device */
807-
ret = -EINVAL;
807+
ret = -ENODEV;
808808
goto exit_free_idev;
809809
}
810810

0 commit comments

Comments
 (0)