diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-04 21:52:05 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-04 21:52:05 +0400 |
| commit | ae6c138353fe822cb720231a707a9f0e0426e0f2 (patch) | |
| tree | 10f8147c8d1a254f5602a5552e43fd52cd03dc95 /drivers/spi | |
| parent | 2570ce2a92608e613669fd40f9d3ee4b8384b0d4 (diff) | |
| parent | bac902d505220544824829affcf9c1b17b57b8ca (diff) | |
| download | linux-ae6c138353fe822cb720231a707a9f0e0426e0f2.tar.xz | |
Merge remote-tracking branch 'spi/fix/topcliff' into spi-linus
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-topcliff-pch.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c index 35f60bd252dd..637d728fbeb5 100644 --- a/drivers/spi/spi-topcliff-pch.c +++ b/drivers/spi/spi-topcliff-pch.c @@ -1487,7 +1487,7 @@ static int pch_spi_pd_probe(struct platform_device *plat_dev) return 0; err_spi_register_master: - free_irq(board_dat->pdev->irq, board_dat); + free_irq(board_dat->pdev->irq, data); err_request_irq: pch_spi_free_resources(board_dat, data); err_spi_get_resources: @@ -1667,6 +1667,7 @@ static int pch_spi_probe(struct pci_dev *pdev, pd_dev = platform_device_alloc("pch-spi", i); if (!pd_dev) { dev_err(&pdev->dev, "platform_device_alloc failed\n"); + retval = -ENOMEM; goto err_platform_device; } pd_dev_save->pd_save[i] = pd_dev; |