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

Commit d7b6e53e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-v3.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO fix from Linus Walleij:
 "Fix up some merge confusion from the merge window"

* tag 'gpio-v3.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: mcp23s08: Eliminates redundant checking.
parents 0b632204 ef8290ac

drivers/gpio/gpio-mcp23s08.c

+0 −6
Original line number Diff line number Diff line
@@ -900,8 +900,6 @@ static int mcp23s08_probe(struct spi_device *spi) 
			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);
@@ -940,10 +938,6 @@ static int mcp23s08_probe(struct spi_device *spi) 
		if (!(spi_present_mask & (1 << addr)))

			continue;

		chips--;

		if (chips < 0) {

			dev_err(&spi->dev, "FATAL: invalid negative chip id\n");

			goto fail;

		}

		data->mcp[addr] = &data->chip[chips];

		status = mcp23s08_probe_one(data->mcp[addr], &spi->dev, spi,

					    0x40 | (addr << 1), type, base,