Merge tag 'gpio-v3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio (081069ff) · Commits · 戴 / test

drivers/gpio/gpio-ich.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -305,6 +305,8 @@ static struct ichx_desc ich6_desc = {

		.ngpio = 50,
		.have_blink = true,
		.regs = ichx_regs,
		.reglen = ichx_reglen,
		};

		/* Intel 3100 */
		@@ -324,6 +326,8 @@ static struct ichx_desc i3100_desc = {
		.uses_gpe0 = true,

		.ngpio = 50,
		.regs = ichx_regs,
		.reglen = ichx_reglen,
		};

		/* ICH7 and ICH8-based */

+7 −5

Original line number	Diff line number	Diff line
		@@ -894,9 +894,11 @@ static int mcp23s08_probe(struct spi_device *spi)
		dev_err(&spi->dev, "invalid spi-present-mask\n");
		return -ENODEV;
		}

		for (addr = 0; addr < ARRAY_SIZE(pdata->chip); addr++)
		for (addr = 0; addr < ARRAY_SIZE(pdata->chip); addr++) {
		if ((spi_present_mask & (1 << addr)))
		chips++;
		pullups[addr] = 0;
		}
		} else {
		type = spi_get_device_id(spi)->driver_data;
		pdata = dev_get_platdata(&spi->dev);
		@@ -919,12 +921,12 @@ static int mcp23s08_probe(struct spi_device *spi)
		pullups[addr] = pdata->chip[addr].pullups;
		}

		if (!chips)
		return -ENODEV;

		base = pdata->base;
		}

		if (!chips)
		return -ENODEV;

		data = kzalloc(sizeof(data) + chips sizeof(struct mcp23s08),
		GFP_KERNEL);
		if (!data)