Unverified Commit bfa4d097 authored by Mark Brown's avatar Mark Brown
Browse files

More minor SDCA bug fixes 

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

Just some minor SDCA bug fixes and some minor structure reordering to
improve the padding.
parents 9004a450 ec630c2c

include/sound/sdca_function.h

+12 −9
Original line number Diff line number Diff line
@@ -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;

};



/**

sound/soc/sdca/sdca_interrupts.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

sound/soc/sdca/sdca_regmap.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

}