diff options
author | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-02-19 13:17:05 +0300 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-02-19 13:17:05 +0300 |
commit | ae6ba10d5090fc7e9095eaef3dcf06ba016725a6 (patch) | |
tree | e631eaa2df52712783acc4d757841da4890c4143 /drivers/mfd/cros_ec_dev.c | |
parent | e6049cf122d1568d8000c7f5bd52c99de07ecc65 (diff) | |
parent | c06de56121e3ac0f0f1f4a081c041654ffcacd62 (diff) | |
download | linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.tar.xz |
Merge drm/drm-next into drm-misc-next
Backmerge drm-next to bring in -rc7
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'drivers/mfd/cros_ec_dev.c')
-rw-r--r-- | drivers/mfd/cros_ec_dev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c index b99a194ce5a4..2d0fee488c5a 100644 --- a/drivers/mfd/cros_ec_dev.c +++ b/drivers/mfd/cros_ec_dev.c @@ -499,6 +499,7 @@ static int ec_device_remove(struct platform_device *pdev) cros_ec_debugfs_remove(ec); + mfd_remove_devices(ec->dev); cdev_del(&ec->cdev); device_unregister(&ec->class_dev); return 0; |