From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jonathan Cameron <Jonathan.Cameron@Huawei•com>
Cc: David Lechner <dlechner@baylibre•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the iio tree with the iio-fixes tree
Date: Tue, 6 May 2025 15:57:28 +1000 [thread overview]
Message-ID: <20250506155728.65605bae@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1708 bytes --]
Hi all,
Today's linux-next merge of the iio tree got a conflict in:
drivers/iio/adc/ad7606.c
between commit:
3f5fd1717ae9 ("iio: adc: ad7606: fix raw read for 18-bit chips")
from the iio-fixes tree and commit:
3b5b55ca9407 ("iio: adc: ad7606: dynamically allocate channel info")
from the iio tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/iio/adc/ad7606.c
index 8ed65a35b486,aa96247d6757..000000000000
--- a/drivers/iio/adc/ad7606.c
+++ b/drivers/iio/adc/ad7606.c
@@@ -726,17 -657,20 +657,18 @@@ static int ad7606_scan_direct(struct ii
if (ret)
goto error_ret;
- chan = &indio_dev->channels[ch + 1];
+ chan = &indio_dev->channels[ch];
+ realbits = chan->scan_type.realbits;
- if (chan->scan_type.sign == 'u') {
- if (realbits > 16)
- *val = st->data.buf32[ch];
- else
- *val = st->data.buf16[ch];
- } else {
- if (realbits > 16)
- *val = sign_extend32(st->data.buf32[ch], realbits - 1);
- else
- *val = sign_extend32(st->data.buf16[ch], realbits - 1);
- }
+ if (realbits > 16)
+ *val = st->data.buf32[ch];
+ else
+ *val = st->data.buf16[ch];
+
+ *val &= GENMASK(realbits - 1, 0);
+
+ if (chan->scan_type.sign == 's')
+ *val = sign_extend32(*val, realbits - 1);
error_ret:
if (!st->gpio_convst) {
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-05-06 5:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-06 5:57 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-05-07 10:05 linux-next: manual merge of the iio tree with the iio-fixes tree Thierry Reding
2026-05-07 10:29 ` Jonathan Cameron
2026-05-07 10:41 ` Thierry Reding
2026-01-20 15:45 Mark Brown
2025-05-06 5:51 Stephen Rothwell
2024-05-31 4:06 Stephen Rothwell
2024-04-30 5:15 Stephen Rothwell
2024-05-02 8:36 ` Jean-Baptiste Maneyrol
2024-05-02 8:58 ` Jonathan Cameron
2021-10-01 3:38 Stephen Rothwell
2021-10-01 8:27 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250506155728.65605bae@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Jonathan.Cameron@Huawei$(echo .)com \
--cc=dlechner@baylibre$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox