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

Commit 1f54f942 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/topic/clps711x' into spi-next

parents db04e170 c8b94d84

drivers/spi/spi-clps711x.c

+0 −6
Original line number Diff line number Diff line
@@ -239,11 +239,8 @@ static int spi_clps711x_probe(struct platform_device *pdev) 
	}



	dev_err(&pdev->dev, "Failed to register master\n");

	devm_free_irq(&pdev->dev, IRQ_SSEOTI, hw);



clk_out:

	devm_clk_put(&pdev->dev, hw->spi_clk);



err_out:

	while (--i >= 0)

		if (gpio_is_valid(hw->chipselect[i]))
@@ -261,13 +258,10 @@ static int spi_clps711x_remove(struct platform_device *pdev) 
	struct spi_master *master = platform_get_drvdata(pdev);

	struct spi_clps711x_data *hw = spi_master_get_devdata(master);



	devm_free_irq(&pdev->dev, IRQ_SSEOTI, hw);



	for (i = 0; i < master->num_chipselect; i++)

		if (gpio_is_valid(hw->chipselect[i]))

			gpio_free(hw->chipselect[i]);



	devm_clk_put(&pdev->dev, hw->spi_clk);

	spi_unregister_master(master);

	kfree(master);