jchzhou/kernel-sophgo-sg2044-revyos-6.17-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More minor SDCA bug fixes

Browse Source 
Merge series from Charles Keepax <ckeepax@opensource.cirrus.com>:

Just some minor SDCA bug fixes and some minor structure reordering to
improve the padding.
This commit is contained in:
Mark Brown
2025-09-04 19:31:51 +01:00
parent 9004a450fc ec630c2c8c
commit bfa4d097f2
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/sound/sdca_function.h
View File

@@ -1063,27 +1063,30 @@ struct sdca_entity_ge {
/**
* struct sdca_entity_hide - information specific to HIDE Entities
* @hid: HID device structure
* @hidtx_ids: HIDTx Report ID
* @num_hidtx_ids: number of HIDTx Report ID
* @hidrx_ids: HIDRx Report ID
* @num_hidrx_ids: number of HIDRx Report ID
* @hide_reside_function_num: indicating which Audio Function Numbers within this Device
* @max_delay: the maximum time in microseconds allowed for the Device to change the ownership from Device to Host
* @af_number_list: which Audio Function Numbers within this Device are sending/receiving the messages in this HIDE
* @hid_desc: HID descriptor for the HIDE Entity
* @hidtx_ids: HIDTx Report ID
* @hidrx_ids: HIDRx Report ID
* @af_number_list: which Audio Function Numbers within this Device are
* sending/receiving the messages in this HIDE
* @hide_reside_function_num: indicating which Audio Function Numbers
* within this Device
* @max_delay: the maximum time in microseconds allowed for the Device
* to change the ownership from Device to Host
* @hid_report_desc: HID Report Descriptor for the HIDE Entity
* @hid_desc: HID descriptor for the HIDE Entity
*/
struct sdca_entity_hide {
struct hid_device *hid;
unsigned int *hidtx_ids;
int num_hidtx_ids;
unsigned int *hidrx_ids;
int num_hidtx_ids;
int num_hidrx_ids;
unsigned int af_number_list[SDCA_MAX_FUNCTION_COUNT];
unsigned int hide_reside_function_num;
unsigned int max_delay;
unsigned int af_number_list[SDCA_MAX_FUNCTION_COUNT];
struct hid_descriptor hid_desc;
unsigned char *hid_report_desc;
struct hid_descriptor hid_desc;
};
/**

2
sound/soc/sdca/sdca_interrupts.c
View File

@@ -155,7 +155,7 @@ static irqreturn_t detected_mode_handler(int irq, void *data)
SDCA_CTL_SELECTED_MODE_NAME);
if (!name)
return -ENOMEM;
return IRQ_NONE;
kctl = snd_soc_component_get_kcontrol(component, name);
if (!kctl) {

2
sound/soc/sdca/sdca_regmap.c
View File

@@ -196,7 +196,7 @@ int sdca_regmap_mbq_size(struct sdca_function_data *function, unsigned int reg)
control = function_find_control(function, reg);
if (!control)
return false;
return -EINVAL;
return clamp_val(control->nbits / BITS_PER_BYTE, sizeof(u8), sizeof(u32));
}