diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2013-06-26 23:08:22 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-06-26 23:08:22 -0700 |
| commit | a9e94ec3504ead4b87a929bc57f5aa99a6590437 (patch) | |
| tree | b6e7aaec0e844dc066e93296a85e5769542ef525 /drivers/iio/frequency/adf4350.c | |
| parent | 36a279686bc02d340eb213a9f2a0b67e50de64b4 (diff) | |
| parent | 2884d4230867c8a46cf701214051e923301e7429 (diff) | |
Merge tag 'fcoe1' into fixes
This patch fixes a critical bug that was introduced in 3.9
related to VLAN tagging FCoE frames.
Diffstat (limited to 'drivers/iio/frequency/adf4350.c')
| -rw-r--r-- | drivers/iio/frequency/adf4350.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c index a884252ac66..e76d4ace53f 100644 --- a/drivers/iio/frequency/adf4350.c +++ b/drivers/iio/frequency/adf4350.c @@ -212,7 +212,7 @@ static int adf4350_set_freq(struct adf4350_state *st, unsigned long long freq) (pdata->r2_user_settings & (ADF4350_REG2_PD_POLARITY_POS | ADF4350_REG2_LDP_6ns | ADF4350_REG2_LDF_INT_N | ADF4350_REG2_CHARGE_PUMP_CURR_uA(5000) | - ADF4350_REG2_MUXOUT(0x7) | ADF4350_REG2_NOISE_MODE(0x9))); + ADF4350_REG2_MUXOUT(0x7) | ADF4350_REG2_NOISE_MODE(0x3))); st->regs[ADF4350_REG3] = pdata->r3_user_settings & (ADF4350_REG3_12BIT_CLKDIV(0xFFF) | |