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

Commit 2b2322d6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/fix/clps711x' into spi-clps711x 

Conflicts:
	drivers/spi/spi-clps711x.c
parents c7083790 0158026c

drivers/spi/spi-clps711x.c

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

			       dev_name(&pdev->dev), hw);

	if (ret) {

	if (ret) {

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

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

		clk_put(hw->spi_clk);

		goto err_out;

		goto err_out;

	}

	}
@@ -246,7 +245,6 @@ static int spi_clps711x_probe(struct platform_device *pdev) 
			gpio_free(hw->chipselect[i]);

			gpio_free(hw->chipselect[i]);





	spi_master_put(master);

	spi_master_put(master);

	kfree(master);





	return ret;

	return ret;

}

}
@@ -262,7 +260,6 @@ static int spi_clps711x_remove(struct platform_device *pdev) 
			gpio_free(hw->chipselect[i]);

			gpio_free(hw->chipselect[i]);





	spi_unregister_master(master);

	spi_unregister_master(master);

	kfree(master);





	return 0;

	return 0;

}

}