Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
  dereferencing freed memory regulator_fixed_voltage_remove()
  regulator: Fix check of unsigned return value and transmit errors in wm831x_gp_ldo_get_mode()
  regulator: Handle missing constraints in _regulator_disable()

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index f8b295700d7d..f9f516a3028a 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -196,11 +196,10 @@ static int regulator_fixed_voltage_remove(struct platform_device *pdev)
         struct fixed_voltage_data *drvdata = platform_get_drvdata(pdev);
 
         regulator_unregister(drvdata->dev);
-        kfree(drvdata->desc.name);
-        kfree(drvdata);
-
         if (gpio_is_valid(drvdata->gpio))
                 gpio_free(drvdata->gpio);
+        kfree(drvdata->desc.name);
+        kfree(drvdata);
 
         return 0;
 }