From: Mark Brown <broonie@linaro.org>
Date: Thu, 3 Oct 2013 16:25:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/fix/clps711x' into spi-clps711x
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2b2322d662237a4b635a755df15e21b9ff80716b;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

Conflicts:
	drivers/spi/spi-clps711x.c
---

2b2322d662237a4b635a755df15e21b9ff80716b
diff --cc drivers/spi/spi-clps711x.c
index 1a786834c16d,6416798828e7..73b9a461853f
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@@ -226,8 -226,7 +226,7 @@@ static int spi_clps711x_probe(struct pl
  			       dev_name(&pdev->dev), hw);
  	if (ret) {
  		dev_err(&pdev->dev, "Can't request IRQ\n");
- 		clk_put(hw->spi_clk);
 -		goto clk_out;
 +		goto err_out;
  	}
  
  	ret = spi_register_master(master);