diff --git a/[refs] b/[refs]
index 71821ced7696..49c029b512ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df4b404b35e3e125b7e6d82f9affc6c704502cb3
+refs/heads/master: f6e8a9687b785b4c75d71370681f7a6e9fd89685
diff --git a/trunk/drivers/staging/iio/adc/mxs-lradc.c b/trunk/drivers/staging/iio/adc/mxs-lradc.c
index eab975d11bb2..6044e1717b20 100644
--- a/trunk/drivers/staging/iio/adc/mxs-lradc.c
+++ b/trunk/drivers/staging/iio/adc/mxs-lradc.c
@@ -983,6 +983,9 @@ static int mxs_lradc_probe(struct platform_device *pdev)
 	if (ret)
 		goto err_trig;
 
+	/* Configure the hardware. */
+	mxs_lradc_hw_init(lradc);
+
 	/* Register the touchscreen input device. */
 	ret = mxs_lradc_ts_register(lradc);
 	if (ret)
@@ -995,9 +998,6 @@ static int mxs_lradc_probe(struct platform_device *pdev)
 		goto err_ts;
 	}
 
-	/* Configure the hardware. */
-	mxs_lradc_hw_init(lradc);
-
 	return 0;
 
 err_ts: