---

yaml
---
r: 292087
b: refs/heads/master
c: 1b65fa8
h: refs/heads/master
i:
  292085: 6a35491
  292083: a75ce61
  292079: fda31ca
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 737f360d5bef5e01c6cfa755dca0b449a154c1e0
+refs/heads/master: 1b65fa8496059d919a16b8431672d11e199ae515

trunk/drivers/mfd/twl-core.c

@@ -751,9 +751,9 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
 
 		/* we need to connect regulators to this transceiver */
 		if (twl_has_regulator() && child) {
-			usb1v5.dev = child;
-			usb1v8.dev = child;
-			usb3v1.dev = child;
+			usb1v5.dev_name = dev_name(child);
+			usb1v8.dev_name = dev_name(child);
+			usb3v1.dev_name = dev_name(child);
 		}
 	}
 	if (twl_has_usb() && pdata->usb && twl_class_is_6030()) {
@@ -799,7 +799,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
 			return PTR_ERR(child);
 		/* we need to connect regulators to this transceiver */
 		if (twl_has_regulator() && child)
-			usb3v3.dev = child;
+			usb3v3.dev_name = dev_name(child);
 	} else if (twl_has_regulator() && twl_class_is_6030()) {
 		if (features & TWL6025_SUBCLASS)
 			child = add_regulator(TWL6025_REG_LDOUSB,