gpio/pca953x: Fix wrong pointer type (1648237d) · Commits · 戴 / test

pca953x_get_alt_pdata() uses uint16_t* as result type for of_get_property(), but numeric of values are __be32. Checking for negative values is bogus because of-property values are unsigned by definition. Instead check for proper property size. v3: - assume big-endian properties - check property size v2: - removed bogus check for negative property values Signed-off-by:

Dirk Eibach <eibach@gdsys.de> Signed-off-by:

Grant Likely <grant.likely@secretlab.ca>

drivers/gpio/pca953x.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -448,7 +448,8 @@ pca953x_get_alt_pdata(struct i2c_client *client)
		{
		struct pca953x_platform_data *pdata;
		struct device_node *node;
		const uint16_t *val;
		const __be32 *val;
		int size;

		node = client->dev.of_node;
		if (node == NULL)
		@@ -461,13 +462,13 @@ pca953x_get_alt_pdata(struct i2c_client *client)
		}

		pdata->gpio_base = -1;
		val = of_get_property(node, "linux,gpio-base", NULL);
		val = of_get_property(node, "linux,gpio-base", &size);
		if (val) {
		if (*val < 0)
		dev_warn(&client->dev,
		"invalid gpio-base in device tree\n");
		if (size != sizeof(*val))
		dev_warn(&client->dev, "%s: wrong linux,gpio-base\n",
		node->full_name);
		else
		pdata->gpio_base = *val;
		pdata->gpio_base = be32_to_cpup(val);
		}

		val = of_get_property(node, "polarity", NULL);

Admin message