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-07 12:25:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "ASoC: codecs: Add count check for swr haptics device up/down"

Browse source
This commit is contained in:
qctecmdr 2020-11-20 02:14:34 -08:00 • committed by Gerrit - the friendly Code Review server
commit 9cd98ddfc7
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -77,6 +77,7 @@ struct swr_haptics_dev {
struct regmap *regmap;
struct swr_port port;
struct regulator *vdd;
u32 enable_cnt;
};
static bool swr_hap_volatile_register(struct device *dev, unsigned int reg)
@ -324,6 +325,7 @@ static int swr_haptics_probe(struct swr_device *sdev)
swr_hap->swr_slave = sdev;
swr_hap->dev = &sdev->dev;
swr_set_dev_data(sdev, swr_hap);
swr_hap->enable_cnt = 0;
rc = swr_haptics_parse_port_mapping(sdev);
if (rc < 0) {
@ -427,6 +429,8 @@ static int swr_haptics_device_up(struct swr_device *sdev)
dev_err(swr_hap->dev, "%s: enable swr-slave failed, rc=%d\n",
__func__, rc);
return rc;
} else {
swr_hap->enable_cnt++;
}
return 0;
@ -443,13 +447,18 @@ static int swr_haptics_device_down(struct swr_device *sdev)
}
/* 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",
if (swr_hap->enable_cnt > 0) {
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 rc;
} else {
swr_hap->enable_cnt--;
}
} else {
swr_hap->enable_cnt = 0;
}
return 0;
}