Merge 3.6-rc6 into staging-next
Greg Kroah-Hartman [Mon, 17 Sep 2012 00:17:25 +0000 (17:17 -0700)]
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>

12 files changed:
1  2 
drivers/hid/hid-core.c
drivers/iio/adc/at91_adc.c
drivers/staging/iio/accel/lis3l02dq_ring.c
drivers/staging/iio/adc/ad7192.c
drivers/staging/iio/gyro/adis16260_core.c
drivers/staging/iio/imu/adis16400_core.c
drivers/staging/iio/meter/ade7753.c
drivers/staging/iio/meter/ade7754.c
drivers/staging/iio/meter/ade7759.c
drivers/staging/nvec/nvec.c
drivers/staging/vt6656/dpc.c
drivers/staging/vt6656/rxtx.c

Simple merge
@@@ -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;
        }
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge