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

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

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

parents 6ce4eac1 4b92894e

drivers/spi/spi.c

+1 −1
Original line number Diff line number Diff line
@@ -1415,7 +1415,7 @@ int devm_spi_register_master(struct device *dev, struct spi_master *master) 
		return -ENOMEM;



	ret = spi_register_master(master);

	if (ret != 0) {

	if (!ret) {

		*ptr = master;

		devres_add(dev, ptr);

	} else {