Merge tag '4.9/mtd-pairing-scheme' of github.com:linux-nand/linux

[cascardo/linux.git] / drivers / mtd / nand / qcom_nandc.c

diff --git a/drivers/mtd/nand/qcom_nandc.c b/drivers/mtd/nand/qcom_nandc.c
index de7d28e..57d483a 100644 (file)
--- a/drivers/mtd/nand/qcom_nandc.c
+++ b/drivers/mtd/nand/qcom_nandc.c
@@ -1957,8 +1957,7 @@ static int qcom_nandc_alloc(struct qcom_nand_controller *nandc)
        INIT_LIST_HEAD(&nandc->desc_list);
        INIT_LIST_HEAD(&nandc->host_list);
 
-       spin_lock_init(&nandc->controller.lock);
-       init_waitqueue_head(&nandc->controller.wq);
+       nand_hw_control_init(&nandc->controller);
 
        return 0;
 }