mmc: dw_mmc: Fix null dma_ops access when use_dma is false
authorJonathan Kliegman <kliegs@chromium.org>
Thu, 14 Jun 2012 17:31:55 +0000 (13:31 -0400)
committerChris Ball <cjb@laptop.org>
Sat, 21 Jul 2012 04:02:09 +0000 (00:02 -0400)
host->dma_ops is not valid if host->usa dma is 0 so protect
host->dma_ops reference in dw_mci_resume

Signed-off-by: Jonathan Kliegman <kliegs@chromium.org>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Acked-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/dw_mmc.c

index 5a600b3..72dc3cd 100644 (file)
@@ -2186,7 +2186,7 @@ int dw_mci_resume(struct dw_mci *host)
                return ret;
        }
 
-       if (host->dma_ops->init)
+       if (host->use_dma && host->dma_ops->init)
                host->dma_ops->init(host);
 
        /* Restore the old value at FIFOTH register */