summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2019-03-14 14:42:47 -0500
committerTom Zanussi <tom.zanussi@linux.intel.com>2019-03-14 14:42:47 -0500
commit6abcea0f17634f4d74ba4453e48fad4dc4a26286 (patch)
tree5d3f98e6e3273f6533a6a57e96c685052690ff3d /drivers/base
parent36362e6383e531acf106980e909f81a24be33fc7 (diff)
parentd9896164529697fade02aafc65a06722f7191d68 (diff)
downloadlinux-rt-6abcea0f17634f4d74ba4453e48fad4dc4a26286.tar.gz
Merge tag 'v4.14.106' into v4.14-rt
This is the 4.14.106 stable release
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/dd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index d928cc6d0638..cb3672cfdaaa 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -850,9 +850,9 @@ static void __device_release_driver(struct device *dev, struct device *parent)
drv->remove(dev);
device_links_driver_cleanup(dev);
- dma_deconfigure(dev);
devres_release_all(dev);
+ dma_deconfigure(dev);
dev->driver = NULL;
dev_set_drvdata(dev, NULL);
if (dev->pm_domain && dev->pm_domain->dismiss)