lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'spi/fix/pxa' into spi-linus

Browse Source
This commit is contained in:
Mark Brown
2013-06-24 12:28:28 +01:00
parent 9e895ace5d cc0ee9873c
commit 2f5a5c1be8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/spi/spi-pxa2xx-dma.c
View File

@@ -59,7 +59,7 @@ static int pxa2xx_spi_map_dma_buffer(struct driver_data *drv_data,
int ret; int ret;
sg_free_table(sgt); sg_free_table(sgt);
ret = sg_alloc_table(sgt, nents, GFP_KERNEL); ret = sg_alloc_table(sgt, nents, GFP_ATOMIC);
if (ret) if (ret)
return ret; return ret;
} }

2
drivers/spi/spi-pxa2xx.c
View File

@@ -1075,7 +1075,7 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev)
acpi_bus_get_device(ACPI_HANDLE(&pdev->dev), &adev)) acpi_bus_get_device(ACPI_HANDLE(&pdev->dev), &adev))
return NULL; return NULL;
pdata = devm_kzalloc(&pdev->dev, sizeof(*ssp), GFP_KERNEL); pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
if (!pdata) { if (!pdata) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"failed to allocate memory for platform data\n"); "failed to allocate memory for platform data\n");