diff options
| -rw-r--r-- | drivers/gpio/gpio-msm-v1.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpio/gpio-msm-v1.c b/drivers/gpio/gpio-msm-v1.c index fb2cc90d0134..e3ceaacde45c 100644 --- a/drivers/gpio/gpio-msm-v1.c +++ b/drivers/gpio/gpio-msm-v1.c | |||
| @@ -652,14 +652,14 @@ static int gpio_msm_v1_probe(struct platform_device *pdev) | |||
| 652 | return irq2; | 652 | return irq2; |
| 653 | 653 | ||
| 654 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 654 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 655 | base1 = devm_request_and_ioremap(&pdev->dev, res); | 655 | base1 = devm_ioremap_resource(&pdev->dev, res); |
| 656 | if (!base1) | 656 | if (IS_ERR(base1)) |
| 657 | return -EADDRNOTAVAIL; | 657 | return PTR_ERR(base1); |
| 658 | 658 | ||
| 659 | res = platform_get_resource(pdev, IORESOURCE_MEM, 1); | 659 | res = platform_get_resource(pdev, IORESOURCE_MEM, 1); |
| 660 | base2 = devm_request_and_ioremap(&pdev->dev, res); | 660 | base2 = devm_ioremap_resource(&pdev->dev, res); |
| 661 | if (!base2) | 661 | if (IS_ERR(base2)) |
| 662 | return -EADDRNOTAVAIL; | 662 | return PTR_ERR(base2); |
| 663 | 663 | ||
| 664 | for (i = FIRST_GPIO_IRQ; i < FIRST_GPIO_IRQ + NR_GPIO_IRQS; i++) { | 664 | for (i = FIRST_GPIO_IRQ; i < FIRST_GPIO_IRQ + NR_GPIO_IRQS; i++) { |
| 665 | if (i - FIRST_GPIO_IRQ >= | 665 | if (i - FIRST_GPIO_IRQ >= |