summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShreshtha SAHU <ssahu@nvidia.com>2014-09-17 15:58:09 +0530
committerWinnie Hsu <whsu@nvidia.com>2014-09-19 10:05:06 -0700
commitd758be8cb8f3f3a06ec1b4042b1af09c8c5de536 (patch)
tree433e978a5e4c96bc4c402e0e7f7f6426798a7820
parented69dc2adccd7cec79c724c2269a7c4cc6c0a74e (diff)
asoc: rt56xx: fix missing device_remove_file
added missing device_remove_file during device remove this resulted failure in modprobe of module Bug 200038187 Bug 200037087 Change-Id: Ibbe8cf92162144d438f5b563bf6d2b9787acc04e Signed-off-by: Shreshtha SAHU <ssahu@nvidia.com> Reviewed-on: http://git-master/r/499745 Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com> Reviewed-by: Zheng Liu <zhliu@nvidia.com> Reviewed-by: Winnie Hsu <whsu@nvidia.com> Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
-rw-r--r--sound/soc/codecs/rt5639.c1
-rw-r--r--sound/soc/codecs/rt5640.c1
-rw-r--r--sound/soc/codecs/rt5645.c2
3 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5639.c b/sound/soc/codecs/rt5639.c
index 6aebb6463c29..e9a5a4db3538 100644
--- a/sound/soc/codecs/rt5639.c
+++ b/sound/soc/codecs/rt5639.c
@@ -3148,6 +3148,7 @@ static int rt5639_probe(struct snd_soc_codec *codec)
static int rt5639_remove(struct snd_soc_codec *codec)
{
rt5639_set_bias_level(codec, SND_SOC_BIAS_OFF);
+ device_remove_file(codec->dev, &dev_attr_index_reg);
return 0;
}
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index 30932cb20e50..65d213b2dc5d 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -2824,6 +2824,7 @@ static int rt5640_remove(struct snd_soc_codec *codec)
CHECK_I2C_SHUTDOWN(rt5640, codec)
rt5640_reset(codec);
snd_soc_write(codec, RT5640_PWR_ANLG1, 0);
+ device_remove_file(codec->dev, &dev_attr_index_reg);
mutex_unlock(&rt5640->lock);
return 0;
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index 689e7bd7f1f7..0fde9c09c1c2 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -3598,6 +3598,8 @@ static int rt5645_probe(struct snd_soc_codec *codec)
static int rt5645_remove(struct snd_soc_codec *codec)
{
rt5645_set_bias_level(codec, SND_SOC_BIAS_OFF);
+ device_remove_file(codec->dev, &dev_attr_codec_reg);
+ device_remove_file(codec->dev, &dev_attr_index_reg);
return 0;
}