aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/input/keyboard/tegra-kbc.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index b46142f78ef2..9cd20e6905a0 100644
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@ -638,12 +638,6 @@ static int tegra_kbc_probe(struct platform_device *pdev)
638 if (!tegra_kbc_check_pin_cfg(kbc, &num_rows)) 638 if (!tegra_kbc_check_pin_cfg(kbc, &num_rows))
639 return -EINVAL; 639 return -EINVAL;
640 640
641 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
642 if (!res) {
643 dev_err(&pdev->dev, "failed to get I/O memory\n");
644 return -ENXIO;
645 }
646
647 kbc->irq = platform_get_irq(pdev, 0); 641 kbc->irq = platform_get_irq(pdev, 0);
648 if (kbc->irq < 0) { 642 if (kbc->irq < 0) {
649 dev_err(&pdev->dev, "failed to get keyboard IRQ\n"); 643 dev_err(&pdev->dev, "failed to get keyboard IRQ\n");
@@ -658,6 +652,7 @@ static int tegra_kbc_probe(struct platform_device *pdev)
658 652
659 setup_timer(&kbc->timer, tegra_kbc_keypress_timer, (unsigned long)kbc); 653 setup_timer(&kbc->timer, tegra_kbc_keypress_timer, (unsigned long)kbc);
660 654
655 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
661 kbc->mmio = devm_ioremap_resource(&pdev->dev, res); 656 kbc->mmio = devm_ioremap_resource(&pdev->dev, res);
662 if (IS_ERR(kbc->mmio)) 657 if (IS_ERR(kbc->mmio))
663 return PTR_ERR(kbc->mmio); 658 return PTR_ERR(kbc->mmio);