Linux 3.14

[~andy/linux] / drivers / dma / k3dma.c

diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index e26075408e9b95a365dfd188cad786593604412f..a1f911aaf220e0b107c1009a74edfaca1ff06634 100644 (file)
--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c
@@ -477,7 +477,7 @@ static struct dma_async_tx_descriptor *k3_dma_prep_slave_sg(
        dma_addr_t addr, src = 0, dst = 0;
        int num = sglen, i;
 
-       if (sgl == 0)
+       if (sgl == NULL)
                return NULL;
 
        for_each_sg(sgl, sg, sglen, i) {
@@ -817,7 +817,7 @@ static int k3_dma_resume(struct device *dev)
        return 0;
 }
 
-SIMPLE_DEV_PM_OPS(k3_dma_pmops, k3_dma_suspend, k3_dma_resume);
+static SIMPLE_DEV_PM_OPS(k3_dma_pmops, k3_dma_suspend, k3_dma_resume);
 
 static struct platform_driver k3_pdma_driver = {
        .driver         = {