From: Mark Brown <broonie@kernel.org>
Date: Mon, 30 Jan 2023 10:47:16 +0000 (+0000)
Subject: Merge remote-tracking branch 'spi/for-6.2' into spi-6.2
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=35bba23e6732a593722c96cbe03ced627f0d8831;p=linux.git

Merge remote-tracking branch 'spi/for-6.2' into spi-6.2
---

35bba23e6732a593722c96cbe03ced627f0d8831
diff --cc drivers/spi/spidev.c
index 1935ca6134470,a1ea093795cfb..3db94d1483ed7
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@@ -101,12 -113,10 +113,11 @@@ spidev_sync(struct spidev_data *spidev
  	if (spi == NULL)
  		status = -ESHUTDOWN;
  	else
- 		status = spi_sync(spi, message);
+ 		status = spidev_sync_unlocked(spi, message);
  
- 	if (status == 0)
- 		status = message->actual_length;
+ 	mutex_unlock(&spidev->spi_lock);
  
 +	mutex_unlock(&spidev->spi_lock);
  	return status;
  }