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

Unverified Commit 130555cf authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/fix/idr' and 'spi/fix/sh-msiof' into spi-linus

parents 39dae59d 42bdd706 36735783

drivers/spi/spi-sh-msiof.c

+1 −1
Original line number Diff line number Diff line
@@ -900,7 +900,7 @@ static int sh_msiof_transfer_one(struct spi_master *master, 
				break;

			copy32 = copy_bswap32;

		} else if (bits <= 16) {

			if (l & 1)

			if (l & 3)

				break;

			copy32 = copy_wswap32;

		} else {

drivers/spi/spi.c

+3 −2
Original line number Diff line number Diff line
@@ -2245,11 +2245,12 @@ static int __unregister(struct device *dev, void *null) 
void spi_unregister_controller(struct spi_controller *ctlr)

{

	struct spi_controller *found;

	int id = ctlr->bus_num;

	int dummy;



	/* First make sure that this controller was ever added */

	mutex_lock(&board_lock);

	found = idr_find(&spi_master_idr, ctlr->bus_num);

	found = idr_find(&spi_master_idr, id);

	mutex_unlock(&board_lock);

	if (found != ctlr) {

		dev_dbg(&ctlr->dev,
@@ -2269,7 +2270,7 @@ void spi_unregister_controller(struct spi_controller *ctlr) 
	device_unregister(&ctlr->dev);

	/* free bus id */

	mutex_lock(&board_lock);

	idr_remove(&spi_master_idr, ctlr->bus_num);

	idr_remove(&spi_master_idr, id);

	mutex_unlock(&board_lock);

}

EXPORT_SYMBOL_GPL(spi_unregister_controller);