[PATCH 4.9 15/45] spi: Fix controller unregister order harder

[Greg Kroah-Hartman]

From: Lukas Wunner <lu...@wunner.de>

Commit c7e41e1caa71 sought to backport upstream commit 84855678add8 to
the 4.9-stable tree but erroneously inserted a line at the wrong place.
Fix it.

Fixes: c7e41e1caa71 ("spi: Fix controller unregister order")
Reported-by: yangerkun <yanger...@huawei.com>
Signed-off-by: Lukas Wunner <lu...@wunner.de>
---
 drivers/spi/spi.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -2025,13 +2025,13 @@ static int __unregister(struct device *d
  */
 void spi_unregister_master(struct spi_master *master)
 {
+       device_for_each_child(&master->dev, NULL, __unregister);
+
        if (master->queued) {
                if (spi_destroy_queue(master))
                        dev_err(&master->dev, "queue remove failed\n");
        }
 
-       device_for_each_child(&master->dev, NULL, __unregister);
-
        mutex_lock(&board_lock);
        list_del(&master->list);
        mutex_unlock(&board_lock);