diff --git a/[refs] b/[refs] index ec7dc81d5145..403f001ed82b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8937cb602bea120248cef64961fc46836a394c8a +refs/heads/master: cd27918dc9d2b730fbb898ff075d4fbfb7f674aa diff --git a/trunk/drivers/gpio/gpio-da9052.c b/trunk/drivers/gpio/gpio-da9052.c index c23761f42199..038f5eb8b13d 100644 --- a/trunk/drivers/gpio/gpio-da9052.c +++ b/trunk/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;