From patchwork Tue Jan 21 17:00:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 13946459 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B127A1F4E49 for ; Tue, 21 Jan 2025 17:00:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737478839; cv=none; b=EH8zaVPlWHGY9RV7EAN2p3ds7CFW0ybnZ7mjCx3KB9rm5vuJWGS8DuwkaAHSyv6YlEE6EHIZQ6r6p3jDVa3IuPr0BweZK1viKshwR/er/iYjIdxDUFGaTrUsi4Pvx3GM34kpmXl+HX7z5FVCG0NuClxOfleqOhvOPVcWf81+kFA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737478839; c=relaxed/simple; bh=3+6R666ywBlWcpI7MygkND3v2vixLSQ/WxbV1sTH1AY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BxAOqIIdTNUyDfR9ugNhsNRxaT215TFp9Bkk77IHdlfj6foqdSn18hLderw0PUJGlSrVziOS0/JpzKjF4ncYthm1TspAwFW1oHiMekEMIzl5O3oD2F52LUgeRnxU5ms7MTTCitVVtMh0aX0ZdGtwOpvbiQZPvWX7Qh1oYQfbikg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=X+IrGyRT; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=40sLOtTZ; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=X+IrGyRT; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=40sLOtTZ; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="X+IrGyRT"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="40sLOtTZ"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="X+IrGyRT"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="40sLOtTZ" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B514C2116D; Tue, 21 Jan 2025 17:00:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1737478835; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t6lL+lUFrtnuO/foo1lYJ7PPBTkOybkD6ykyjEmincM=; b=X+IrGyRT5j9tpbhs4GXdG5ux1HytThwUx8+habyaABiQPPUfdddH1LqrMa7gK+HTX8ciT6 gqvsyz1RvL7hDWgB7HpGJACaUimRPV8/uqCfYnQAbFPqJVYsic9i0joT5LAZfv+2OYTx4u +MSLsKgtEBnTqcPpYa2bAl4t68z1AJA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1737478835; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t6lL+lUFrtnuO/foo1lYJ7PPBTkOybkD6ykyjEmincM=; b=40sLOtTZMtv80GbX1MX21apZGdiytI6mOom6ON+vlj5mB6m6F1vwVdX2NeDCp2J+A2+cO8 YNXL4DR0N+3ihwCQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1737478835; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t6lL+lUFrtnuO/foo1lYJ7PPBTkOybkD6ykyjEmincM=; b=X+IrGyRT5j9tpbhs4GXdG5ux1HytThwUx8+habyaABiQPPUfdddH1LqrMa7gK+HTX8ciT6 gqvsyz1RvL7hDWgB7HpGJACaUimRPV8/uqCfYnQAbFPqJVYsic9i0joT5LAZfv+2OYTx4u +MSLsKgtEBnTqcPpYa2bAl4t68z1AJA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1737478835; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t6lL+lUFrtnuO/foo1lYJ7PPBTkOybkD6ykyjEmincM=; b=40sLOtTZMtv80GbX1MX21apZGdiytI6mOom6ON+vlj5mB6m6F1vwVdX2NeDCp2J+A2+cO8 YNXL4DR0N+3ihwCQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 8FB0D13991; Tue, 21 Jan 2025 17:00:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id WDSYIbPSj2d3bgAAD6G6ig (envelope-from ); Tue, 21 Jan 2025 17:00:35 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Cc: "Geoffrey D . Bennett" Subject: [PATCH 1/3] ALSA: usb: fcp: Fix meter_levels type to __le32 Date: Tue, 21 Jan 2025 18:00:29 +0100 Message-ID: <20250121170032.7236-2-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250121170032.7236-1-tiwai@suse.de> References: <20250121170032.7236-1-tiwai@suse.de> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Score: -2.80 X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.997]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_TWO(0.00)[2]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email]; RCVD_TLS_ALL(0.00)[] X-Spam-Flag: NO X-Spam-Level: The cached level meter values are returned from the USB core as __le32, hence declare properly. Fixes: 46757a3e7d50 ("ALSA: FCP: Add Focusrite Control Protocol driver") Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202501212331.SaePSmsA-lkp@intel.com/ Signed-off-by: Takashi Iwai --- sound/usb/fcp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/usb/fcp.c b/sound/usb/fcp.c index ecdd18335ab7..92e3caab0b82 100644 --- a/sound/usb/fcp.c +++ b/sound/usb/fcp.c @@ -100,7 +100,7 @@ struct fcp_data { u8 num_meter_slots; s16 *meter_level_map; - u32 *meter_levels; + __le32 *meter_levels; struct snd_kcontrol *meter_ctl; unsigned int *meter_labels_tlv; @@ -383,7 +383,7 @@ static int fcp_meter_ctl_get(struct snd_kcontrol *kctl, struct usb_mixer_interface *mixer = elem->head.mixer; struct fcp_data *private = mixer->private_data; int num_meter_slots, resp_size; - u32 *resp = private->meter_levels; + __le32 *resp = private->meter_levels; int i, err = 0; struct { @@ -655,7 +655,7 @@ static int fcp_ioctl_set_meter_map(struct usb_mixer_interface *mixer, /* If the control doesn't exist, create it */ if (!private->meter_ctl) { s16 *new_map __free(kfree) = NULL; - u32 *meter_levels __free(kfree) = NULL; + __le32 *meter_levels __free(kfree) = NULL; /* Allocate buffer for the map */ new_map = kmalloc_array(map.map_size, sizeof(s16), GFP_KERNEL); @@ -663,7 +663,7 @@ static int fcp_ioctl_set_meter_map(struct usb_mixer_interface *mixer, return -ENOMEM; /* Allocate buffer for reading meter levels */ - meter_levels = kmalloc_array(map.meter_slots, sizeof(u32), + meter_levels = kmalloc_array(map.meter_slots, sizeof(__le32), GFP_KERNEL); if (!meter_levels) return -ENOMEM; From patchwork Tue Jan 21 17:00:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 13946458 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B130B1F4E4C for ; Tue, 21 Jan 2025 17:00:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737478839; cv=none; b=GU13qHt1ackqDQclw8zmAkJDGTrYRlstf64oh9znibUbcCWHX8O1BAzae+pexKJLQdbJuBImBkDT1YWby0/30g4fgy+xG+mnVcRIeHqQfIWNSx0IUwGxEndmrOMpYVslfk6LO2p5ZZx2fpc9Yrq7nXPKfX6qZDArztDdEr+5pSs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737478839; c=relaxed/simple; bh=8z4G2fp6T+ZjY7acr4HlTnt32vej3Ww8emRdQk/v4xQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E9NTnZ4dgLGyitxYjiNE48bsX1kqpgX2T8FUSh/dtDFPbpZ69E3+gD55Ictbrto8AwuAUHTdZYTK6O2gHcGmJX2THqOFByWNjvBpPEKOixaY++t0gVDWZ1eKw4k0v4Y29QSpckOE5BZOlveCdufgYueRuq2TjNlaMuj+ROzmxGM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=t15jHHpN; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=pKjAXBuI; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=QUYmS5Ev; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=PPHx0yib; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="t15jHHpN"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="pKjAXBuI"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="QUYmS5Ev"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="PPHx0yib" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id EAF7421170; Tue, 21 Jan 2025 17:00:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1737478836; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AD630wfZ+P5WZK23IYD4R90wClKt+m7Qxargbdevkp8=; b=t15jHHpNdIQ+WGI4PFjjTzX5YDv+0CSxadMzn/2Rg1idUHU2NxHky0fjXQkg5WjBCauu82 lpDdlVSm9u5qBc/j16igFrIdlJFyAx9dHUYRq9mckN7GfLYSTf+TICgvaAoLLO8PFztwaP jJsC5+aLrFlTbslsillEziS2XYSon3E= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1737478836; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AD630wfZ+P5WZK23IYD4R90wClKt+m7Qxargbdevkp8=; b=pKjAXBuICnCs0LHQjyI70YkCYybnRhH3hTsUS4yNORUDZHCM39e2SDghpGHQ+v6d80XQOX v0LDPFV1ymFIrtBA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1737478835; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AD630wfZ+P5WZK23IYD4R90wClKt+m7Qxargbdevkp8=; b=QUYmS5EvXkCMX7Z92wKIOGr2n0Y830ex0cR8jzgweiEpRmWwH8ZD/tI/MqN9igqA1Q6Ryw hobmiScniImsBlsgLe9fT5PAufFLQ+ZTDBzp98BIfoPuFQoF7mzReN3K9dWvFzdUXq5LBg D13vHkKPotmoF1wn+Vg2WLu4jbMd2tc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1737478835; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AD630wfZ+P5WZK23IYD4R90wClKt+m7Qxargbdevkp8=; b=PPHx0yib/TAI/BMD+FOn+z5bOKrM5Sk7A03fabRM42hMt2l/H1uSr2hxVbV3hhmXG4McRy XOkGNQILF1fP9sBw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id C5B8D1387C; Tue, 21 Jan 2025 17:00:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 6CzuLrPSj2d3bgAAD6G6ig (envelope-from ); Tue, 21 Jan 2025 17:00:35 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Cc: "Geoffrey D . Bennett" Subject: [PATCH 2/3] ALSA: usb: fcp: Fix incorrect resp->opcode retrieval Date: Tue, 21 Jan 2025 18:00:30 +0100 Message-ID: <20250121170032.7236-3-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250121170032.7236-1-tiwai@suse.de> References: <20250121170032.7236-1-tiwai@suse.de> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.998]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_TWO(0.00)[2]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:mid]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 X-Spam-Flag: NO Fix a wrong conversion macro used for resp->opcode, which is __le32. Fixes: 46757a3e7d50 ("ALSA: FCP: Add Focusrite Control Protocol driver") Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202501212331.SaePSmsA-lkp@intel.com/ Signed-off-by: Takashi Iwai --- sound/usb/fcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/fcp.c b/sound/usb/fcp.c index 92e3caab0b82..cfa131b35e43 100644 --- a/sound/usb/fcp.c +++ b/sound/usb/fcp.c @@ -266,7 +266,7 @@ static int fcp_usb(struct usb_mixer_interface *mixer, u32 opcode, if (req->opcode != resp->opcode) { usb_audio_err(mixer->chip, "FCP response %08x opcode mismatch %08x\n", - opcode, le16_to_cpu(resp->opcode)); + opcode, le32_to_cpu(resp->opcode)); return -EINVAL; } From patchwork Tue Jan 21 17:00:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 13946460 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA5F01F4E46 for ; Tue, 21 Jan 2025 17:00:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737478839; cv=none; b=A8Mh4v+BeUwsJ7vrGBmMMaqiq5HdRCeY+kNke7k227K38fwxSRWKMoC4w07huprA2Nh/gWwY8DJaUf8yLBlTw2p5KY8OUT7MMvDGKnpW1vxv3+cKVJ2tDJdtPam70KslGrQmhYbSe0mI+iwOyq5gz56KDPIP7u0WIiuFQnvkKuk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737478839; c=relaxed/simple; bh=RnK5/nYbd++PfS0Bj2dQu4etfx0T59rsTOZLD3Ls1Pw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MwNDiKY7SXqHaQ67uKj5I23itpsTnV9C7Fv27tRLrmOdfum8mZLflmFqQOJYLjutTN+2vf5iccxDDsmE9eM/QT1gLpwOP6TW7+9+LBSPsn/gTeHPgXuJ1gil+BltVkpK5Gnklkf6pUJXYRP90/JD1bXw3ZwF5+DbVbptz0vd+O0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=siNJDs2k; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=gUHnWCw6; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=siNJDs2k; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=gUHnWCw6; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="siNJDs2k"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="gUHnWCw6"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="siNJDs2k"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="gUHnWCw6" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 144A51F443; Tue, 21 Jan 2025 17:00:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1737478836; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+sJL/2REsJzqo9iNn7I6z4ygayRN493pLzw2vvVTRyQ=; b=siNJDs2k9ukBGu5zk1d9w16BKfYM2ccu624oGUWyOKjWwlvg16i2dEBIdDTrY8h5sXwi5A Mzz+7BVMe6w/IBNL7lGVy+qpnF4/JufYd+e++uzl6VuJtBpzuHXdLquUQJIpE+vTD2OtCB ehDmsMmXIixhQQwi1QaEOtnCpI3b+tI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1737478836; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+sJL/2REsJzqo9iNn7I6z4ygayRN493pLzw2vvVTRyQ=; b=gUHnWCw6BsfJ11VFEuNcVw2x/+FsXI0PbF7OMl1VAiezizfD3lx/Mzi2lHn5T0+zBEQNMc TT6H6TLCPzn25LBA== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=siNJDs2k; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=gUHnWCw6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1737478836; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+sJL/2REsJzqo9iNn7I6z4ygayRN493pLzw2vvVTRyQ=; b=siNJDs2k9ukBGu5zk1d9w16BKfYM2ccu624oGUWyOKjWwlvg16i2dEBIdDTrY8h5sXwi5A Mzz+7BVMe6w/IBNL7lGVy+qpnF4/JufYd+e++uzl6VuJtBpzuHXdLquUQJIpE+vTD2OtCB ehDmsMmXIixhQQwi1QaEOtnCpI3b+tI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1737478836; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+sJL/2REsJzqo9iNn7I6z4ygayRN493pLzw2vvVTRyQ=; b=gUHnWCw6BsfJ11VFEuNcVw2x/+FsXI0PbF7OMl1VAiezizfD3lx/Mzi2lHn5T0+zBEQNMc TT6H6TLCPzn25LBA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id EB3A313991; Tue, 21 Jan 2025 17:00:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id gOQ1OLPSj2d3bgAAD6G6ig (envelope-from ); Tue, 21 Jan 2025 17:00:35 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Cc: "Geoffrey D . Bennett" Subject: [PATCH 3/3] ALSA: usb: fcp: Fix return code from poll ops Date: Tue, 21 Jan 2025 18:00:31 +0100 Message-ID: <20250121170032.7236-4-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250121170032.7236-1-tiwai@suse.de> References: <20250121170032.7236-1-tiwai@suse.de> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Rspamd-Queue-Id: 144A51F443 X-Spam-Score: -3.01 X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,suse.de:email]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Flag: NO X-Spam-Level: Fix a sparse warning due to the invalid return type from poll ops, which is __poll_t. Fixes: 46757a3e7d50 ("ALSA: FCP: Add Focusrite Control Protocol driver") Signed-off-by: Takashi Iwai --- sound/usb/fcp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/usb/fcp.c b/sound/usb/fcp.c index cfa131b35e43..7df65041ace5 100644 --- a/sound/usb/fcp.c +++ b/sound/usb/fcp.c @@ -843,18 +843,18 @@ static long fcp_hwdep_read(struct snd_hwdep *hw, char __user *buf, return sizeof(event); } -static unsigned int fcp_hwdep_poll(struct snd_hwdep *hw, - struct file *file, - poll_table *wait) +static __poll_t fcp_hwdep_poll(struct snd_hwdep *hw, + struct file *file, + poll_table *wait) { struct usb_mixer_interface *mixer = hw->private_data; struct fcp_data *private = mixer->private_data; - unsigned int mask = 0; + __poll_t mask = 0; poll_wait(file, &private->notify.queue, wait); if (private->notify.event) - mask |= POLLIN | POLLRDNORM; + mask |= EPOLLIN | EPOLLRDNORM; return mask; }