[PATCH v1 1/1] spi: spidev: Use SPI_MODE_USER_MASK instead of casting

[PATCH v1 1/1] spi: spidev: Use SPI_MODE_USER_MASK instead of casting

[Andy Shevchenko]

Currently the 16-bit mode is what being used in user space.
However assuming that is not fully correct. Instead we should
use the respective mask, i.e. SPI_MODE_USER_MASK, which
precisely defines what bits are available for user space apps.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/spi/spidev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 1bd73e322b7b..968dab2f5e3d 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -415,7 +415,7 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 				tmp |= SPI_CS_HIGH;
 
 			tmp |= spi->mode & ~SPI_MODE_MASK;
-			spi->mode = (u16)tmp;
+			spi->mode = tmp & SPI_MODE_USER_MASK;
 			retval = spi_setup(spi);
 			if (retval < 0)
 				spi->mode = save;
-- 
2.33.0

Re: [PATCH v1 1/1] spi: spidev: Use SPI_MODE_USER_MASK instead of casting

[Mark Brown]

On Mon, 22 Nov 2021 19:52:45 +0200, Andy Shevchenko wrote:
> Currently the 16-bit mode is what being used in user space.
> However assuming that is not fully correct. Instead we should
> use the respective mask, i.e. SPI_MODE_USER_MASK, which
> precisely defines what bits are available for user space apps.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/1] spi: spidev: Use SPI_MODE_USER_MASK instead of casting
      commit: dd06a0c6b6f64f6610c0bb8f7651df3ebfb0f990

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark