Merge tag 'spi-v3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi (f97f7d2d) · Commits · 戴 / test

Pull spi updates from Mark Brown: "A few last minute SPI updates: fix a missized allocation and use atomic allocations in atomic context in the PXA driver, and fix the checking of return codes in the S3C64xx driver which caused spurious errors under heavy load." * tag 'spi-v3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: spi/pxa2xx: fix memory corruption due to wrong size used in devm_kzalloc() spi/pxa2xx: use GFP_ATOMIC in sg table allocation spi: s3c64xx: Fix pm_runtime_get_sync() return value check

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");

drivers/spi/spi-s3c64xx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message