diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-24 12:28:28 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-24 12:28:28 +0100 |
| commit | 2f5a5c1be8b2eb1e2a1e77566a65d3c4f330d3c9 (patch) | |
| tree | 4f622f5ab48c55c24f70104f842479697e49cf92 | |
| parent | 9e895ace5d82df8929b16f58e9f515f6d54ab82d (diff) | |
| parent | cc0ee9873c6afafb387379ca1df25da78a08c603 (diff) | |
Merge remote-tracking branch 'spi/fix/pxa' into spi-linus
| -rw-r--r-- | drivers/spi/spi-pxa2xx-dma.c | 2 | ||||
| -rw-r--r-- | drivers/spi/spi-pxa2xx.c | 2 |
2 files changed, 2 insertions, 2 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"); |