From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 21 Jan 2025 17:00:31 +0000 (+0100)
Subject: ALSA: usb: fcp: Fix return code from poll ops
X-Git-Tag: v6.14-rc1~111^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a8f5f4652ef4d530a7cb8bed2b6e502cdfa825f;p=thirdparty%2Fkernel%2Fstable.git

ALSA: usb: fcp: Fix return code from poll ops

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")
Link: https://patch.msgid.link/20250121170032.7236-4-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/usb/fcp.c b/sound/usb/fcp.c
index cfa131b35e439..7df65041ace55 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;
 }