Commit 1136ced4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soundwire-6.11-fixes_2' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire 

Pull soundwire fix from Vinod Koul:

 - Revert of earlier fix sent for non-continuous port map programming
   which caused regression on Intel platforms

* tag 'soundwire-6.11-fixes_2' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
  soundwire: stream: Revert "soundwire: stream: fix programming slave ports for non-continous port maps"
parents 46040ea8 233a95fd

drivers/soundwire/stream.c

+4 −4
Original line number Diff line number Diff line
@@ -1291,18 +1291,18 @@ struct sdw_dpn_prop *sdw_get_slave_dpn_prop(struct sdw_slave *slave, 
					    unsigned int port_num)

{

	struct sdw_dpn_prop *dpn_prop;

	unsigned long mask;

	u8 num_ports;

	int i;



	if (direction == SDW_DATA_DIR_TX) {

		mask = slave->prop.source_ports;

		num_ports = hweight32(slave->prop.source_ports);

		dpn_prop = slave->prop.src_dpn_prop;

	} else {

		mask = slave->prop.sink_ports;

		num_ports = hweight32(slave->prop.sink_ports);

		dpn_prop = slave->prop.sink_dpn_prop;

	}



	for_each_set_bit(i, &mask, 32) {

	for (i = 0; i < num_ports; i++) {

		if (dpn_prop[i].num == port_num)

			return &dpn_prop[i];

	}