Skip to content

Commit

Permalink
gpio/pca953x: Fix wrong pointer type
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dirk Eibach authored and Grant Likely committed Feb 24, 2011
1 parent c437667 commit 1648237
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions drivers/gpio/pca953x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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);
Expand Down

0 comments on commit 1648237

Please sign in to comment.