diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-12-21 03:36:21 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-12-21 03:36:21 -0500 |
| commit | 0529357f102b96f68bc199f858d1c3b07f4b674c (patch) | |
| tree | eaa047952a768099e00a5245afa0d84799df6990 /drivers/gpio/gpio-palmas.c | |
| parent | a9f1a3e4c1c7dc82711bc22dc52c7b0d6912ed56 (diff) | |
| parent | 4ef7675344d687a0ef5b0d7c0cee12da005870c0 (diff) | |
Merge tag 'v4.4-rc6' into devel
Linux 4.4-rc6
Diffstat (limited to 'drivers/gpio/gpio-palmas.c')
| -rw-r--r-- | drivers/gpio/gpio-palmas.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-palmas.c b/drivers/gpio/gpio-palmas.c index 5f09ed1700dc..ddd1a00c839d 100644 --- a/drivers/gpio/gpio-palmas.c +++ b/drivers/gpio/gpio-palmas.c | |||
| @@ -169,6 +169,8 @@ static int palmas_gpio_probe(struct platform_device *pdev) | |||
| 169 | const struct palmas_device_data *dev_data; | 169 | const struct palmas_device_data *dev_data; |
| 170 | 170 | ||
| 171 | match = of_match_device(of_palmas_gpio_match, &pdev->dev); | 171 | match = of_match_device(of_palmas_gpio_match, &pdev->dev); |
| 172 | if (!match) | ||
| 173 | return -ENODEV; | ||
| 172 | dev_data = match->data; | 174 | dev_data = match->data; |
| 173 | if (!dev_data) | 175 | if (!dev_data) |
| 174 | dev_data = &palmas_dev_data; | 176 | dev_data = &palmas_dev_data; |