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

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

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

parents 1e8081da 2b2322d6

drivers/spi/spi-clps711x.c

+1 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static int spi_clps711x_probe(struct platform_device *pdev) 
			       dev_name(&pdev->dev), hw);

	if (ret) {

		dev_err(&pdev->dev, "Can't request IRQ\n");

		goto clk_out;

		goto err_out;

	}



	ret = devm_spi_register_master(&pdev->dev, master);
@@ -239,7 +239,6 @@ static int spi_clps711x_probe(struct platform_device *pdev) 


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



clk_out:

err_out:

	while (--i >= 0)

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