summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-08-29 00:49:26 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-08-29 00:49:25 -0700
commit2b4e8cbd34b48aa29ef8f7fff9a09d034764eb93 (patch)
treeb8e30d16af7377e6525eec60501cebd83e9d9669 /drivers/mfd
parent50618ab44f51b26c088a90d4eb3b9a84bde1302b (diff)
parent5ab1e18aa3913d454e1bd1498b20ee581aae2c6b (diff)
Merge "Revert "Merge remote-tracking branch 'msm-4.4/tmp-510d0a3f' into msm-4.4""
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/intel-lpss.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c
index 68aa31ae553a..6255513f54c7 100644
--- a/drivers/mfd/intel-lpss.c
+++ b/drivers/mfd/intel-lpss.c
@@ -445,7 +445,6 @@ int intel_lpss_probe(struct device *dev,
err_remove_ltr:
intel_lpss_debugfs_remove(lpss);
intel_lpss_ltr_hide(lpss);
- intel_lpss_unregister_clock(lpss);
err_clk_register:
ida_simple_remove(&intel_lpss_devid_ida, lpss->devid);