From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 8 Jun 2012 06:55:37 +0000 (+0300)
Subject: iio: frequency: adf4350: fix an initialization
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e86ee142a223ec85efda7c66b3e99fe79aa8cc4f;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

iio: frequency: adf4350: fix an initialization

Sparse complains about this:
drivers/iio/frequency/adf4350.c:58:29: warning: Initializer entry defined twice
drivers/iio/frequency/adf4350.c:59:10:   also defined here

It looks like '|' was intended here instead of ','.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c
index 2d09f82d9752..6ce45f5c0deb 100644
--- a/drivers/iio/frequency/adf4350.c
+++ b/drivers/iio/frequency/adf4350.c
@@ -54,7 +54,7 @@ struct adf4350_state {
 static struct adf4350_platform_data default_pdata = {
 	.clkin = 122880000,
 	.channel_spacing = 10000,
-	.r2_user_settings = ADF4350_REG2_PD_POLARITY_POS,
+	.r2_user_settings = ADF4350_REG2_PD_POLARITY_POS |
 			    ADF4350_REG2_CHARGE_PUMP_CURR_uA(2500),
 	.r3_user_settings = ADF4350_REG3_12BIT_CLKDIV_MODE(0),
 	.r4_user_settings = ADF4350_REG4_OUTPUT_PWR(3) |