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

Commit fbf3d36c authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/fix/dw', 'spi/fix/lantiq' and 'spi/fix/pl022' into spi-linus

parents 5a7ad114 400c18e3 ad2fca07 849794c5

drivers/spi/spi-dw-mmio.c

+1 −1
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ static int dw_spi_mmio_remove(struct platform_device *pdev) 
{

	struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev);



	clk_disable_unprepare(dwsmmio->clk);

	dw_spi_remove_host(&dwsmmio->dws);

	clk_disable_unprepare(dwsmmio->clk);



	return 0;

}

drivers/spi/spi-lantiq-ssc.c

+222 −215

File changed.

Preview size limit exceeded, changes collapsed.

drivers/spi/spi-pl022.c

+1 −1
Original line number Diff line number Diff line
@@ -2074,7 +2074,7 @@ pl022_platform_data_dt_get(struct device *dev) 
{

	struct device_node *np = dev->of_node;

	struct pl022_ssp_controller *pd;

	u32 tmp;

	u32 tmp = 0;



	if (!np) {

		dev_err(dev, "no dt node defined\n");