summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorDan Murphy <dmurphy@ti.com>2020-09-18 14:05:44 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-29 10:11:25 +0100
commitde7d94b911655936e27e67d631282c28a393b0e5 (patch)
tree0aeb87e2aa8a0851863f5c5a09530ff300c69a32 /sound/soc
parent9f83ae2e34110cf155f7e199cff60a9fcce058ab (diff)
downloadlinux-stable-de7d94b911655936e27e67d631282c28a393b0e5.tar.gz
linux-stable-de7d94b911655936e27e67d631282c28a393b0e5.tar.bz2
linux-stable-de7d94b911655936e27e67d631282c28a393b0e5.zip
ASoC: tas2770: Fix unbalanced calls to pm_runtime
[ Upstream commit d3d71c99b541040da198f43da3bbd85d8e9598cb ] Fix the unbalanced call to the pm_runtime_disable when removing the module. pm_runtime_enable is not called nor is the pm_runtime setup in the code. Remove the i2c_remove function and the pm_runtime_disable. Fixes: 1a476abc723e6 ("tas2770: add tas2770 smart PA kernel driver") Signed-off-by: Dan Murphy <dmurphy@ti.com> Link: https://lore.kernel.org/r/20200918190548.12598-5-dmurphy@ti.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/tas2770.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/codecs/tas2770.c b/sound/soc/codecs/tas2770.c
index 15cdd8b11a67..3226c6d4493e 100644
--- a/sound/soc/codecs/tas2770.c
+++ b/sound/soc/codecs/tas2770.c
@@ -16,7 +16,6 @@
#include <linux/i2c.h>
#include <linux/gpio.h>
#include <linux/gpio/consumer.h>
-#include <linux/pm_runtime.h>
#include <linux/regulator/consumer.h>
#include <linux/firmware.h>
#include <linux/regmap.h>
@@ -781,13 +780,6 @@ end:
return result;
}
-static int tas2770_i2c_remove(struct i2c_client *client)
-{
- pm_runtime_disable(&client->dev);
- return 0;
-}
-
-
static const struct i2c_device_id tas2770_i2c_id[] = {
{ "tas2770", 0},
{ }
@@ -808,7 +800,6 @@ static struct i2c_driver tas2770_i2c_driver = {
.of_match_table = of_match_ptr(tas2770_of_match),
},
.probe = tas2770_i2c_probe,
- .remove = tas2770_i2c_remove,
.id_table = tas2770_i2c_id,
};