diff --git a/debian/changelog b/debian/changelog
index c1b9ddcc5..d3212fdd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ linux-2.6 (3.1.4-2) UNRELEASED; urgency=low
 
   * Fix generation of revisions for the patch list.
 
+  [ Hector Oron ]
+  * regulator: backport fix for nullpointer dereference in core.
+
  -- Bastian Blank <waldi@debian.org>  Thu, 01 Dec 2011 13:17:34 +0100
 
 linux-2.6 (3.1.4-1) unstable; urgency=low
diff --git a/debian/patches/bugfix/all/regulator_enable-nullpointer-dereference.patch b/debian/patches/bugfix/all/regulator_enable-nullpointer-dereference.patch
new file mode 100644
index 000000000..e760e1a8a
--- /dev/null
+++ b/debian/patches/bugfix/all/regulator_enable-nullpointer-dereference.patch
@@ -0,0 +1,26 @@
+commit d1685e4e2c3854782272f32b71f2f3eff5c6e0d0
+Author: Heiko Stübner <heiko@sntech.de>
+Date:   Fri Oct 14 18:00:29 2011 +0200
+
+    regulator: Fix possible nullpointer dereference in regulator_enable()
+
+    In the case where _regulator_enable returns an error it was not checked
+    if a supplying regulator exists before trying to disable it, leading
+    to a null pointer-dereference if no supplying regulator existed.
+
+    Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+
+Index: source/drivers/regulator/core.c
+===================================================================
+--- source.orig/drivers/regulator/core.c	2011-11-28 22:48:14.000000000 +0000
++++ source/drivers/regulator/core.c	2011-12-03 23:01:59.000000000 +0000
+@@ -1425,7 +1425,7 @@
+ 	ret = _regulator_enable(rdev);
+ 	mutex_unlock(&rdev->mutex);
+ 
+-	if (ret != 0)
++	if (ret != 0 && rdev->supply)
+ 		regulator_disable(rdev->supply);
+ 
+ 	return ret;
diff --git a/debian/patches/series/base b/debian/patches/series/base
index 92e8b16d2..fe9d88efc 100644
--- a/debian/patches/series/base
+++ b/debian/patches/series/base
@@ -56,6 +56,7 @@
 + bugfix/all/PM-Freezer-Reimplement-wait_event_freezekillable-usi.patch
 + bugfix/all/hfs-fix-hfs_find_init-sb-ext_tree-NULL-ptr-oops.patch
 + features/x86/x86-Add-amilo-rfkill-driver-for-some-Fujitsu-Siemens.patch
++ bugfix/all/regulator_enable-nullpointer-dereference.patch
 
 # Defer until we're sure about the system call number
 #+ bugfix/ia64/ia64-Add-accept4-syscall.patch