hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "sound: usx2y: move to use usb_control_msg_send()" 

This reverts commit ec8eeceb06.
The API has to be changed.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Link: https://lore.kernel.org/r/20200923134348.23862-7-oneukum@suse.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oliver Neukum 2020-09-23 15:43:40 +02:00 committed by Greg Kroah-Hartman
parent 8cc4c2ed6a
commit 3b7672c3eb
1 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sound/usb/usx2y/us122l.c
View File

@ -82,13 +82,40 @@ static int us144_create_usbmidi(struct snd_card *card)
&US122L(card)->midi_list, &quirk); &US122L(card)->midi_list, &quirk);
} }
/*
* Wrapper for usb_control_msg().
* Allocates a temp buffer to prevent dmaing from/to the stack.
*/
static int us122l_ctl_msg(struct usb_device *dev, unsigned int pipe,
__u8 request, __u8 requesttype,
__u16 value, __u16 index, void *data,
__u16 size, int timeout)
{
int err;
void *buf = NULL;
if (size > 0) {
buf = kmemdup(data, size, GFP_KERNEL);
if (!buf)
return -ENOMEM;
}
err = usb_control_msg(dev, pipe, request, requesttype,
value, index, buf, size, timeout);
if (size > 0) {
memcpy(data, buf, size);
kfree(buf);
}
return err;
}
static void pt_info_set(struct usb_device *dev, u8 v) static void pt_info_set(struct usb_device *dev, u8 v)
{ {
int ret; int ret;
ret = usb_control_msg_send(dev, 0, 'I', ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, 'I',
v, 0, NULL, 0, 1000); USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
v, 0, NULL, 0, 1000);
snd_printdd(KERN_DEBUG "%i\n", ret); snd_printdd(KERN_DEBUG "%i\n", ret);
} }
@ -278,11 +305,10 @@ static int us122l_set_sample_rate(struct usb_device *dev, int rate)
data[0] = rate; data[0] = rate;
data[1] = rate >> 8; data[1] = rate >> 8;
data[2] = rate >> 16; data[2] = rate >> 16;
err = usb_control_msg_send(dev, 0, UAC_SET_CUR, err = us122l_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC_SET_CUR,
USB_TYPE_CLASS | USB_RECIP_ENDPOINT | USB_DIR_OUT, USB_TYPE_CLASS|USB_RECIP_ENDPOINT|USB_DIR_OUT,
UAC_EP_CS_ATTR_SAMPLE_RATE << 8, ep, data, 3, UAC_EP_CS_ATTR_SAMPLE_RATE << 8, ep, data, 3, 1000);
1000); if (err < 0)
if (err)
snd_printk(KERN_ERR "%d: cannot set freq %d to ep 0x%x\n", snd_printk(KERN_ERR "%d: cannot set freq %d to ep 0x%x\n",
dev->devnum, rate, ep); dev->devnum, rate, ep);
return err; return err;