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

Commit ae6c1383 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 2570ce2a bac902d5

drivers/spi/spi-topcliff-pch.c

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