From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Linus Walleij <linus.walleij@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Michael Welling <mwelling@ieee•org>,
Michael Stickel <ms@mycable•de>
Subject: linux-next: manual merge of the gpio tree with Linus' tree
Date: Wed, 28 May 2014 19:00:11 +1000 [thread overview]
Message-ID: <20140528190011.302a2e52@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1172 bytes --]
Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in
drivers/gpio/gpio-mcp23s08.c between commit 99e4b98dbe3a ("gpio:
mcp23s08: Bug fix of SPI device tree registration") from Linus' tree
and commit 3e3bed913e8b ("gpio: mcp23s08: fixed count variable for
devicetree probing") from the gpio tree.
I fixed it up (one way - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/gpio/gpio-mcp23s08.c
index 3d53fd6880d1,00fbb30b9b10..000000000000
--- a/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
@@@ -894,11 -894,14 +894,12 @@@ static int mcp23s08_probe(struct spi_de
dev_err(&spi->dev, "invalid spi-present-mask\n");
return -ENODEV;
}
+
for (addr = 0; addr < ARRAY_SIZE(pdata->chip); addr++) {
- if ((spi_present_mask & (1 << addr)))
- chips++;
pullups[addr] = 0;
+ if (spi_present_mask & (1 << addr))
+ chips++;
}
- if (!chips)
- return -ENODEV;
} else {
type = spi_get_device_id(spi)->driver_data;
pdata = dev_get_platdata(&spi->dev);
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-05-28 9:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-28 9:00 Stephen Rothwell [this message]
2014-05-28 13:38 ` linux-next: manual merge of the gpio tree with Linus' tree Michael Welling
2014-05-28 15:34 ` Michael Stickel
-- strict thread matches above, loose matches on Subject: below --
2020-04-01 4:03 Stephen Rothwell
2012-05-14 8:31 Stephen Rothwell
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=20140528190011.302a2e52@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ms@mycable$(echo .)de \
--cc=mwelling@ieee$(echo .)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