diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 10:43:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 10:43:16 -0400 |
| commit | 78283dd29e647775cb1e63a4d6554b3090b9a9ff (patch) | |
| tree | 46a179781ed356c0546379ecc46ca5daed7ae50a /drivers/gpio/gpio-msm-v2.c | |
| parent | 435932f2c75efcdd07273a437b9be32647d56d73 (diff) | |
| parent | 5ae90d8e467e625e447000cb4335c4db973b1095 (diff) | |
Merge 3.11-rc3 into usb-next
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 | } |