Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / gpio / gpio-da9052.c

diff --git a/drivers/gpio/gpio-da9052.c b/drivers/gpio/gpio-da9052.c
index c23761f..038f5eb 100644 (file)
--- a/drivers/gpio/gpio-da9052.c
+++ b/drivers/gpio/gpio-da9052.c
@@ -219,7 +219,6 @@ static int __devinit da9052_gpio_probe(struct platform_device *pdev)
        gpio->da9052 = dev_get_drvdata(pdev->dev.parent);
        pdata = gpio->da9052->dev->platform_data;
 
-       gpio->da9052 = dev_get_drvdata(pdev->dev.parent);
        gpio->gp = reference_gp;
        if (pdata && pdata->gpio_base)
                gpio->gp.base = pdata->gpio_base;