From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 17 Sep 2012 00:17:25 +0000 (-0700)
Subject: Merge 3.6-rc6 into staging-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6a2a2cdd57d11ee3117539b846a45df6efbd35b1;p=linux-beck.git

Merge 3.6-rc6 into staging-next

This pulls in the staging tree fixes in 3.6-rc6 into our branch to resolve the
merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

6a2a2cdd57d11ee3117539b846a45df6efbd35b1
diff --cc drivers/iio/adc/at91_adc.c
index bc10091fe76c,3bd5540238a7..3ed94bf80596
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@@ -589,17 -602,22 +589,17 @@@ static int __devinit at91_adc_probe(str
  		goto error_free_irq;
  	}
  
 -	ret = clk_prepare(st->clk);
 +	ret = clk_prepare_enable(st->clk);
  	if (ret) {
 -		dev_err(&pdev->dev, "Could not prepare the clock.\n");
 -		goto error_free_clk;
 -	}
 -
 -	ret = clk_enable(st->clk);
 -	if (ret) {
 -		dev_err(&pdev->dev, "Could not enable the clock.\n");
 -		goto error_unprepare_clk;
 +		dev_err(&pdev->dev,
 +			"Could not prepare or enable the clock.\n");
 +		goto error_free_irq;
  	}
  
 -	st->adc_clk = clk_get(&pdev->dev, "adc_op_clk");
 +	st->adc_clk = devm_clk_get(&pdev->dev, "adc_op_clk");
  	if (IS_ERR(st->adc_clk)) {
  		dev_err(&pdev->dev, "Failed to get the ADC clock.\n");
- 		ret = PTR_ERR(st->clk);
+ 		ret = PTR_ERR(st->adc_clk);
  		goto error_disable_clk;
  	}