Commit 9ce5db27 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/fix/core' into spi-linus

parents 9f9499ae 157f38f9

drivers/spi/spi.c

+1 −1
Original line number Diff line number Diff line
@@ -1705,7 +1705,7 @@ struct spi_master *spi_alloc_master(struct device *dev, unsigned size) 
	master->bus_num = -1;

	master->num_chipselect = 1;

	master->dev.class = &spi_master_class;

	master->dev.parent = get_device(dev);

	master->dev.parent = dev;

	spi_master_set_devdata(master, &master[1]);



	return master;

CRA Git | Maintained and supported by SUSTech CRA and CCSE