diff options
| author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2018-12-13 10:26:26 -0600 |
|---|---|---|
| committer | Tom Zanussi <tom.zanussi@linux.intel.com> | 2018-12-13 10:26:26 -0600 |
| commit | a1ee2b9ba07788dc6fcf367ea7af03e6acabc53a (patch) | |
| tree | 5b3049efdcda6b982aa653d5aa5513d321a1f14a /drivers/w1/masters/omap_hdq.c | |
| parent | a3456b7dddca102a7ca8e36d0f87cfc71e1b068f (diff) | |
| parent | 1ed089625825edd4e98c3b84d935dfcdcb93c9c9 (diff) | |
| download | linux-rt-a1ee2b9ba07788dc6fcf367ea7af03e6acabc53a.tar.gz | |
Merge tag 'v3.18.126' into v3.18-rt
This is the 3.18.126 stable release
Diffstat (limited to 'drivers/w1/masters/omap_hdq.c')
| -rw-r--r-- | drivers/w1/masters/omap_hdq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c index 9900e8ec7393..8612816dfb32 100644 --- a/drivers/w1/masters/omap_hdq.c +++ b/drivers/w1/masters/omap_hdq.c @@ -622,6 +622,8 @@ static int omap_hdq_remove(struct platform_device *pdev) /* remove module dependency */ pm_runtime_disable(&pdev->dev); + w1_remove_master_device(&omap_w1_master); + return 0; } |