diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-02 07:08:33 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-02 07:08:46 +0200 |
| commit | 8afe2cb4d4af5b472adeac9132200dc8c9100821 (patch) | |
| tree | b6164ed60137b82e6e820a329999f4f0f515bd84 /drivers/pinctrl | |
| parent | 12657cb99e1ca670da6a7cace3b238a42003e629 (diff) | |
| parent | fff76d57d2670a8f15c875355fb840665ebf8a3e (diff) | |
| download | barebox-8afe2cb4d4af5b472adeac9132200dc8c9100821.tar.gz barebox-8afe2cb4d4af5b472adeac9132200dc8c9100821.tar.xz | |
Merge branch 'for-next-manual/oftree-linux-sync'
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/pinctrl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl.c b/drivers/pinctrl/pinctrl.c index fa979a1b78..7c797d35bc 100644 --- a/drivers/pinctrl/pinctrl.c +++ b/drivers/pinctrl/pinctrl.c @@ -64,14 +64,14 @@ int pinctrl_select_state(struct device_d *dev, const char *name) if (!np) return 0; - if (!of_find_property(np, "pinctrl-0")) + if (!of_find_property(np, "pinctrl-0", NULL)) return 0; /* For each defined state ID */ for (state = 0; ; state++) { /* Retrieve the pinctrl-* property */ propname = asprintf("pinctrl-%d", state); - prop = of_find_property(np, propname); + prop = of_find_property(np, propname, NULL); free(propname); if (!prop) { |