aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/extcon/extcon-class.c
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-11-19 21:32:12 +1100
committerJames Morris <james.l.morris@oracle.com>2014-11-19 21:32:12 +1100
commitb10778a00d40b3d9fdaaf5891e802794781ff71c (patch)
tree6ba4cbac86eecedc3f30650e7f764ecf00c83898 /drivers/extcon/extcon-class.c
parentintegrity: do zero padding of the key id (diff)
parentLinux 3.17 (diff)
downloadwireguard-linux-b10778a00d40b3d9fdaaf5891e802794781ff71c.tar.xz
wireguard-linux-b10778a00d40b3d9fdaaf5891e802794781ff71c.zip
Merge commit 'v3.17' into next
Diffstat (limited to '')
-rw-r--r--drivers/extcon/extcon-class.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/extcon/extcon-class.c b/drivers/extcon/extcon-class.c
index 18d42c0e4581..4c2f2c543bb7 100644
--- a/drivers/extcon/extcon-class.c
+++ b/drivers/extcon/extcon-class.c
@@ -645,6 +645,8 @@ struct extcon_dev *devm_extcon_dev_allocate(struct device *dev,
return edev;
}
+ edev->dev.parent = dev;
+
*ptr = edev;
devres_add(dev, ptr);