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

Commit 711e020c authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/fix/spidev' and 'spi/fix/xtfpga' into spi-linus

parents 5132361c dd85ebf6 b0b48550

drivers/spi/spi-xtensa-xtfpga.c

+2 −2
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ struct xtfpga_spi { 
static inline void xtfpga_spi_write32(const struct xtfpga_spi *spi,

				      unsigned addr, u32 val)

{

	iowrite32(val, spi->regs + addr);

	__raw_writel(val, spi->regs + addr);

}



static inline unsigned int xtfpga_spi_read32(const struct xtfpga_spi *spi,

					     unsigned addr)

{

	return ioread32(spi->regs + addr);

	return __raw_readl(spi->regs + addr);

}



static inline void xtfpga_spi_wait_busy(struct xtfpga_spi *xspi)

drivers/spi/spidev.c

+2 −1
Original line number Diff line number Diff line
@@ -651,6 +651,7 @@ static int spidev_release(struct inode *inode, struct file *filp) 
		kfree(spidev->rx_buffer);

		spidev->rx_buffer = NULL;



		if (spidev->spi)

			spidev->speed_hz = spidev->spi->max_speed_hz;



		/* ... after we unbound from the underlying device? */