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

Commit 33d5097d authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Mark Brown
Browse files

spi: pic32-sqi: fixup wait_for_completion_timeout return handling 



wait_for_completion_timeout returns unsigned long not int so the check for
<= 0 should be == 0 here, and the type unsigned long. The function return
is set to -ETIMEDOUT to reflect the actual problem.

Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 523d939e

drivers/spi/spi-pic32-sqi.c

+4 −3
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ static int pic32_sqi_one_message(struct spi_master *master, 
	struct spi_transfer *xfer;

	struct pic32_sqi *sqi;

	int ret = 0, mode;

	unsigned long timeout;

	u32 val;



	sqi = spi_master_get_devdata(master);
@@ -419,10 +420,10 @@ static int pic32_sqi_one_message(struct spi_master *master, 
	writel(val, sqi->regs + PESQI_BD_CTRL_REG);



	/* wait for xfer completion */

	ret = wait_for_completion_timeout(&sqi->xfer_done, 5 * HZ);

	if (ret <= 0) {

	timeout = wait_for_completion_timeout(&sqi->xfer_done, 5 * HZ);

	if (timeout == 0) {

		dev_err(&sqi->master->dev, "wait timedout/interrupted\n");

		ret = -EIO;

		ret = -ETIMEDOUT;

		msg->status = ret;

	} else {

		/* success */