A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 06:09:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "ASoC: swr-haptics: Remove disable regulator during system suspend"

Browse source
This commit is contained in:
qctecmdr 2020-07-27 05:45:11 -07:00 • committed by Gerrit - the friendly Code Review server
commit a15eb28837
1 changed files with 6 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

27
asoc/codecs/swr-haptics.c
View file

@ -456,48 +456,33 @@ static int swr_haptics_device_down(struct swr_device *sdev)
static int swr_haptics_suspend(struct device *dev)
{
struct swr_haptics_dev *swr_hap;
int rc;
int rc = 0;
swr_hap = swr_get_dev_data(to_swr_device(dev));
if (!swr_hap) {
dev_err(dev, "%s: no data for swr_hap\n", __func__);
return -ENODEV;
}
trace_printk("%s: suspended\n", __func__);
/* Put SWR slave into reset */
rc = regulator_disable(swr_hap->vdd);
if (rc < 0) {
dev_err(swr_hap->dev, "%s: disable swr-slave failed, rc=%d\n",
__func__, rc);
return rc;
}
return 0;
return rc;
}
static int swr_haptics_resume(struct device *dev)
{
struct swr_haptics_dev *swr_hap;
int rc;
int rc = 0;
swr_hap = swr_get_dev_data(to_swr_device(dev));
if (!swr_hap) {
dev_err(dev, "%s: no data for swr_hap\n", __func__);
return -ENODEV;
}
trace_printk("%s: resumed\n", __func__);
/* Take SWR slave out of reset */
rc = regulator_enable(swr_hap->vdd);
if (rc < 0) {
dev_err(swr_hap->dev, "%s: enable swr-slave failed, rc=%d\n",
__func__, rc);
return rc;
}
return 0;
return rc;
}
static const struct of_device_id swr_haptics_match_table[] = {
{ .compatible = "qcom,swr-haptics", },
{ .compatible = "qcom,pm8350b-swr-haptics", },