1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/mfd/twl6040-core.c b/drivers/mfd/twl6040-core.c
index 51c3b47be655..7dc8c4715001 100644
--- a/drivers/mfd/twl6040-core.c
+++ b/drivers/mfd/twl6040-core.c
@@ -470,7 +470,6 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, twl6040);
 
         twl6040->dev = &pdev->dev;
-        twl6040->audpwron = pdata->audpwron_gpio;
         twl6040->irq = pdata->naudint_irq;
         twl6040->irq_base = pdata->irq_base;
 
@@ -480,6 +479,12 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
 
         twl6040->rev = twl6040_reg_read(twl6040, TWL6040_REG_ASICREV);
 
+        /* ERRATA: Automatic power-up is not possible in ES1.0 */
+        if (twl6040_get_revid(twl6040) > TWL6040_REV_ES1_0)
+                twl6040->audpwron = pdata->audpwron_gpio;
+        else
+                twl6040->audpwron = -EINVAL;
+
         if (gpio_is_valid(twl6040->audpwron)) {
                 ret = gpio_request(twl6040->audpwron, "audpwron");
                 if (ret)
@@ -490,10 +495,6 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
                         goto gpio2_err;
         }
 
-        /* ERRATA: Automatic power-up is not possible in ES1.0 */
-        if (twl6040_get_revid(twl6040) == TWL6040_REV_ES1_0)
-                twl6040->audpwron = -EINVAL;
-
         /* codec interrupt */
         ret = twl6040_irq_init(twl6040);
         if (ret)