Unverified Commit c84dda37 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Mark Brown
Browse files

spi: aspeed: Fix an error handling path in aspeed_spi_[read|write]_user() 



A aspeed_spi_start_user() is not balanced by a corresponding
aspeed_spi_stop_user().
Add the missing call.

Fixes: e3228ed9 ("spi: spi-mem: Convert Aspeed SMC driver to spi-mem")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://patch.msgid.link/4052aa2f9a9ea342fa6af83fa991b55ce5d5819e.1732051814.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fac04efc

drivers/spi/spi-aspeed-smc.c

+6 −4
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static ssize_t aspeed_spi_read_user(struct aspeed_spi_chip *chip, 


	ret = aspeed_spi_send_cmd_addr(chip, op->addr.nbytes, offset, op->cmd.opcode);

	if (ret < 0)

		return ret;

		goto stop_user;



	if (op->dummy.buswidth && op->dummy.nbytes) {

		for (i = 0; i < op->dummy.nbytes / op->dummy.buswidth; i++)
@@ -249,8 +249,9 @@ static ssize_t aspeed_spi_read_user(struct aspeed_spi_chip *chip, 
	aspeed_spi_set_io_mode(chip, io_mode);



	aspeed_spi_read_from_ahb(buf, chip->ahb_base, len);

stop_user:

	aspeed_spi_stop_user(chip);

	return 0;

	return ret;

}



static ssize_t aspeed_spi_write_user(struct aspeed_spi_chip *chip,
@@ -261,10 +262,11 @@ static ssize_t aspeed_spi_write_user(struct aspeed_spi_chip *chip, 
	aspeed_spi_start_user(chip);

	ret = aspeed_spi_send_cmd_addr(chip, op->addr.nbytes, op->addr.val, op->cmd.opcode);

	if (ret < 0)

		return ret;

		goto stop_user;

	aspeed_spi_write_to_ahb(chip->ahb_base, op->data.buf.out, op->data.nbytes);

stop_user:

	aspeed_spi_stop_user(chip);

	return 0;

	return ret;

}



/* support for 1-1-1, 1-1-2 or 1-1-4 */