Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48b30e10 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'iio-fixes-for-5.3b' of... 

Merge tag 'iio-fixes-for-5.3b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus

Jonathan writes:

Second set of IIO fix for the 5.3 cycle.

* adf4371
  - Calculation of the value to program to control the output frequency
    was incorrect.
* max9611
  - Fix temperature reading in probe.  A recent fix for a wrong mask
    meant this code was looked at afresh.  A second bug became obvious
    in which the return value was used inplace of the desired register
    value.  This had no visible effect other than a communication test
    not actually testing the communications.

* tag 'iio-fixes-for-5.3b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio:
  iio: adc: max9611: Fix temperature reading in probe
  iio: frequency: adf4371: Fix output frequency setting
parents 8e2a589a b9ddd509

drivers/iio/adc/max9611.c

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ static int max9611_init(struct max9611_dev *max9611) 
	if (ret)

		return ret;



	regval = ret & MAX9611_TEMP_MASK;

	regval &= MAX9611_TEMP_MASK;



	if ((regval > MAX9611_TEMP_MAX_POS &&

	     regval < MAX9611_TEMP_MIN_NEG) ||

drivers/iio/frequency/adf4371.c

+4 −4
Original line number Diff line number Diff line
@@ -276,11 +276,11 @@ static int adf4371_set_freq(struct adf4371_state *st, unsigned long long freq, 
	st->buf[0] = st->integer >> 8;

	st->buf[1] = 0x40; /* REG12 default */

	st->buf[2] = 0x00;

	st->buf[3] = st->fract2 & 0xFF;

	st->buf[4] = st->fract2 >> 7;

	st->buf[5] = st->fract2 >> 15;

	st->buf[3] = st->fract1 & 0xFF;

	st->buf[4] = st->fract1 >> 8;

	st->buf[5] = st->fract1 >> 16;

	st->buf[6] = ADF4371_FRAC2WORD_L(st->fract2 & 0x7F) |

		     ADF4371_FRAC1WORD(st->fract1 >> 23);

		     ADF4371_FRAC1WORD(st->fract1 >> 24);

	st->buf[7] = ADF4371_FRAC2WORD_H(st->fract2 >> 7);

	st->buf[8] = st->mod2 & 0xFF;

	st->buf[9] = ADF4371_MOD2WORD(st->mod2 >> 8);