Merge remote-tracking branch 'omap_dss2/for-next'

[deliverable/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 de7d28e62d4e5aeee107894b8f9a11c66f63ed66..57d483ac5765a8aa889da61042aa5c75b64404a0 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;
 }