Commit eca8960a authored May 30, 2013 by Stephen Warren Committed by Mark Brown Jun 01, 2013

spi: fix incorrect handling of min param in SPI_BPW_RANGE_MASK



SPI_BPW_RANGE_MASK is intended to work by calculating two masks; one
representing support for all bits up-to-and-including the "max" supported
value, and one representing support for all bits up-to-but-not-including
the "min" supported value, and then taking the difference between the
two, resulting in a mask representing support for all bits between
(inclusive) the min and max values.

However, the second mask ended up representing all bits up-to-and-
including rather up-to-but-not-including. Fix this bug.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

parent 4dd9572a

include/linux/spi/spi.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -310,7 +310,7 @@ struct spi_master {
		u32 bits_per_word_mask;
		#define SPI_BPW_MASK(bits) BIT((bits) - 1)
		#define SPI_BIT_MASK(bits) (((bits) == 32) ? ~0UL : (BIT(bits) - 1))
		#define SPI_BPW_RANGE_MASK(min, max) (SPI_BIT_MASK(max) - SPI_BIT_MASK(min))
		#define SPI_BPW_RANGE_MASK(min, max) (SPI_BIT_MASK(max) - SPI_BIT_MASK(min - 1))

		/* other constraints relevant to this driver */
		u16 flags;

Admin message