3 files changed, 3 insertions, 3 deletions

diff --git a/drivers/spi/spi-pxa2xx-dma.c b/drivers/spi/spi-pxa2xx-dma.c
index c735c5a008a2..6427600b5bbe 100644
--- a/drivers/spi/spi-pxa2xx-dma.c
+++ b/drivers/spi/spi-pxa2xx-dma.c
@@ -59,7 +59,7 @@ static int pxa2xx_spi_map_dma_buffer(struct driver_data *drv_data,
                 int ret;
 
                 sg_free_table(sgt);
-                ret = sg_alloc_table(sgt, nents, GFP_KERNEL);
+                ret = sg_alloc_table(sgt, nents, GFP_ATOMIC);
                 if (ret)
                         return ret;
         }
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index f5d84d6f8222..48b396fced0a 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1075,7 +1075,7 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev)
             acpi_bus_get_device(ACPI_HANDLE(&pdev->dev), &adev))
                 return NULL;
 
-        pdata = devm_kzalloc(&pdev->dev, sizeof(*ssp), GFP_KERNEL);
+        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
         if (!pdata) {
                 dev_err(&pdev->dev,
                         "failed to allocate memory for platform data\n");
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 5000586cb98d..71cc3e6ef47c 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -444,7 +444,7 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi)
         }
 
         ret = pm_runtime_get_sync(&sdd->pdev->dev);
-        if (ret != 0) {
+        if (ret < 0) {
                 dev_err(dev, "Failed to enable device: %d\n", ret);
                 goto out_tx;
         }