diff options
| author | Grant Likely <grant.likely@linaro.org> | 2013-08-28 15:18:13 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2013-08-28 15:18:13 -0400 |
| commit | 8be137f2664f0abb096626a9d2ce0fcdd955b109 (patch) | |
| tree | 2c53a5535265a58eb397d6fbbab2ec26e92e6931 /drivers/gpio/gpio-msm-v2.c | |
| parent | 8851b9f1625ce0858e9b1bb0ae4a57d4b43178b1 (diff) | |
| parent | d8dfad3876e4386666b759da3c833d62fb8b2267 (diff) | |
Merge tag 'v3.11-rc7' into devicetree/next
Linux 3.11-rc7
Diffstat (limited to 'drivers/gpio/gpio-msm-v2.c')
| -rw-r--r-- | drivers/gpio/gpio-msm-v2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-msm-v2.c b/drivers/gpio/gpio-msm-v2.c index f4491a497cc8..c2fa77086eb5 100644 --- a/drivers/gpio/gpio-msm-v2.c +++ b/drivers/gpio/gpio-msm-v2.c | |||
| @@ -378,7 +378,7 @@ static int msm_gpio_probe(struct platform_device *pdev) | |||
| 378 | int ret, ngpio; | 378 | int ret, ngpio; |
| 379 | struct resource *res; | 379 | struct resource *res; |
| 380 | 380 | ||
| 381 | if (!of_property_read_u32(pdev->dev.of_node, "ngpio", &ngpio)) { | 381 | if (of_property_read_u32(pdev->dev.of_node, "ngpio", &ngpio)) { |
| 382 | dev_err(&pdev->dev, "%s: ngpio property missing\n", __func__); | 382 | dev_err(&pdev->dev, "%s: ngpio property missing\n", __func__); |
| 383 | return -EINVAL; | 383 | return -EINVAL; |
| 384 | } | 384 | } |