Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus'

Browse Source
This commit is contained in:
Takashi Iwai 2024-11-20 14:18:45 +01:00
commit f871256106
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sound/usb/quirks.c
View File

@ -555,6 +555,7 @@ int snd_usb_create_quirk(struct snd_usb_audio *chip,
static int snd_usb_extigy_boot_quirk(struct usb_device *dev, struct usb_interface *intf) static int snd_usb_extigy_boot_quirk(struct usb_device *dev, struct usb_interface *intf)
{ {
struct usb_host_config *config = dev->actconfig; struct usb_host_config *config = dev->actconfig;
struct usb_device_descriptor new_device_descriptor;
int err; int err;
if (le16_to_cpu(get_cfg_desc(config)->wTotalLength) == EXTIGY_FIRMWARE_SIZE_OLD || if (le16_to_cpu(get_cfg_desc(config)->wTotalLength) == EXTIGY_FIRMWARE_SIZE_OLD ||
@ -566,10 +567,14 @@ static int snd_usb_extigy_boot_quirk(struct usb_device *dev, struct usb_interfac
if (err < 0) if (err < 0)
dev_dbg(&dev->dev, "error sending boot message: %d\n", err); dev_dbg(&dev->dev, "error sending boot message: %d\n", err);
err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, err = usb_get_descriptor(dev, USB_DT_DEVICE, 0,
&dev->descriptor, sizeof(dev->descriptor)); &new_device_descriptor, sizeof(new_device_descriptor));
config = dev->actconfig;
if (err < 0) if (err < 0)
dev_dbg(&dev->dev, "error usb_get_descriptor: %d\n", err); dev_dbg(&dev->dev, "error usb_get_descriptor: %d\n", err);
if (new_device_descriptor.bNumConfigurations > dev->descriptor.bNumConfigurations)
dev_dbg(&dev->dev, "error too large bNumConfigurations: %d\n",
new_device_descriptor.bNumConfigurations);
else
memcpy(&dev->descriptor, &new_device_descriptor, sizeof(dev->descriptor));
err = usb_reset_configuration(dev); err = usb_reset_configuration(dev);
if (err < 0) if (err < 0)
dev_dbg(&dev->dev, "error usb_reset_configuration: %d\n", err); dev_dbg(&dev->dev, "error usb_reset_configuration: %d\n", err);
@ -901,6 +906,7 @@ static void mbox2_setup_48_24_magic(struct usb_device *dev)
static int snd_usb_mbox2_boot_quirk(struct usb_device *dev) static int snd_usb_mbox2_boot_quirk(struct usb_device *dev)
{ {
struct usb_host_config *config = dev->actconfig; struct usb_host_config *config = dev->actconfig;
struct usb_device_descriptor new_device_descriptor;
int err; int err;
u8 bootresponse[0x12]; u8 bootresponse[0x12];
int fwsize; int fwsize;
@ -936,10 +942,14 @@ static int snd_usb_mbox2_boot_quirk(struct usb_device *dev)
dev_dbg(&dev->dev, "device initialised!\n"); dev_dbg(&dev->dev, "device initialised!\n");
err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, err = usb_get_descriptor(dev, USB_DT_DEVICE, 0,
&dev->descriptor, sizeof(dev->descriptor)); &new_device_descriptor, sizeof(new_device_descriptor));
config = dev->actconfig;
if (err < 0) if (err < 0)
dev_dbg(&dev->dev, "error usb_get_descriptor: %d\n", err); dev_dbg(&dev->dev, "error usb_get_descriptor: %d\n", err);
if (new_device_descriptor.bNumConfigurations > dev->descriptor.bNumConfigurations)
dev_dbg(&dev->dev, "error too large bNumConfigurations: %d\n",
new_device_descriptor.bNumConfigurations);
else
memcpy(&dev->descriptor, &new_device_descriptor, sizeof(dev->descriptor));
err = usb_reset_configuration(dev); err = usb_reset_configuration(dev);
if (err < 0) if (err < 0)
@ -1249,6 +1259,7 @@ static void mbox3_setup_defaults(struct usb_device *dev)
static int snd_usb_mbox3_boot_quirk(struct usb_device *dev) static int snd_usb_mbox3_boot_quirk(struct usb_device *dev)
{ {
struct usb_host_config *config = dev->actconfig; struct usb_host_config *config = dev->actconfig;
struct usb_device_descriptor new_device_descriptor;
int err; int err;
int descriptor_size; int descriptor_size;
@ -1262,10 +1273,14 @@ static int snd_usb_mbox3_boot_quirk(struct usb_device *dev)
dev_dbg(&dev->dev, "MBOX3: device initialised!\n"); dev_dbg(&dev->dev, "MBOX3: device initialised!\n");
err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, err = usb_get_descriptor(dev, USB_DT_DEVICE, 0,
&dev->descriptor, sizeof(dev->descriptor)); &new_device_descriptor, sizeof(new_device_descriptor));
config = dev->actconfig;
if (err < 0) if (err < 0)
dev_dbg(&dev->dev, "MBOX3: error usb_get_descriptor: %d\n", err); dev_dbg(&dev->dev, "MBOX3: error usb_get_descriptor: %d\n", err);
if (new_device_descriptor.bNumConfigurations > dev->descriptor.bNumConfigurations)
dev_dbg(&dev->dev, "MBOX3: error too large bNumConfigurations: %d\n",
new_device_descriptor.bNumConfigurations);
else
memcpy(&dev->descriptor, &new_device_descriptor, sizeof(dev->descriptor));
err = usb_reset_configuration(dev); err = usb_reset_configuration(dev);
if (err < 0) if (err < 0)