Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f5a5c1b authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 9e895ace cc0ee987

drivers/spi/spi-pxa2xx-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/spi/spi-pxa2xx.c

+1 −1
Original line number Diff line number Diff line
@@ -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");