linux-next: build failure after merge of the sound tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi all,

After merging the sound tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

sound/usb/fcp.c: In function 'fcp_hwdep_init':
sound/usb/fcp.c:889:22: error: assignment to 'long int (*)(struct snd_hwdep *, char *, long int,  loff_t *)' {aka 'long int (*)(struct snd_hwdep *, char *, long int,  long long int *)'} from incompatible pointer type 'ssize_t (*)(struct snd_hwdep *, char *, long int,  loff_t *)' {aka 'int (*)(struct snd_hwdep *, char *, long int,  long long int *)'} [-Wincompatible-pointer-types]
  889 |         hw->ops.read = fcp_hwdep_read;
      |                      ^

Caused by commit

  46757a3e7d50 ("ALSA: FCP: Add Focusrite Control Protocol driver")

I have applied the following patch for today.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 20 Jan 2025 14:49:12 +1100
Subject: [PATCH] fixup for "ALSA: FCP: Add Focusrite Control Protocol driver"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 sound/usb/fcp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/usb/fcp.c b/sound/usb/fcp.c
index eb6a5c1f9b21..8e9ed9c4de08 100644
--- a/sound/usb/fcp.c
+++ b/sound/usb/fcp.c
@@ -815,13 +815,13 @@ static int fcp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
 	/* not reached */
 }
 
-static ssize_t fcp_hwdep_read(struct snd_hwdep *hw, char __user *buf,
+static long fcp_hwdep_read(struct snd_hwdep *hw, char __user *buf,
 			      long count, loff_t *offset)
 {
 	struct usb_mixer_interface *mixer = hw->private_data;
 	struct fcp_data *private = mixer->private_data;
 	unsigned long flags;
-	ssize_t ret = 0;
+	long ret = 0;
 	u32 event;
 
 	if (count < sizeof(event))
-- 
2.45.2

-- 
Cheers,
Stephen Rothwell

Attachment: pgp5_TJpIqncX.pgp
Description: OpenPGP digital signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux