Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1fd7686 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: regmap: soundwire: fix incorrect register writes"

parents f576e6d4 11ee355f

drivers/base/regmap/regmap-swr.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ static int regmap_swr_gather_write(void *context, 
	size_t addr_bytes, val_bytes;

	size_t addr_bytes, val_bytes;

	int i, ret = 0;

	int i, ret = 0;

	u16 reg_addr = 0;

	u16 reg_addr = 0;

	u8 *value;





	if (swr == NULL) {

	if (swr == NULL) {

		dev_err(dev, "%s: swr device is NULL\n", __func__);

		dev_err(dev, "%s: swr device is NULL\n", __func__);
@@ -47,12 +48,11 @@ static int regmap_swr_gather_write(void *context, 
	val_bytes = map->format.val_bytes;

	val_bytes = map->format.val_bytes;

	/* val_len = val_bytes * val_count */

	/* val_len = val_bytes * val_count */

	for (i = 0; i < (val_len / val_bytes); i++) {

	for (i = 0; i < (val_len / val_bytes); i++) {

		reg_addr = reg_addr + i;

		value = (u8 *)val + (val_bytes * i);

		val = (u8 *)val + (val_bytes * i);

		ret = swr_write(swr, swr->dev_num, (reg_addr + i), value);

		ret = swr_write(swr, swr->dev_num, reg_addr, val);

		if (ret < 0) {

		if (ret < 0) {

			dev_err(dev, "%s: write reg 0x%x failed, err %d\n",

			dev_err(dev, "%s: write reg 0x%x failed, err %d\n",

				__func__, reg_addr, ret);

				__func__, (reg_addr + i), ret);

			break;

			break;

		}

		}

	}

	}