diff options
| author | Manoj Gangwal <mgangwal@nvidia.com> | 2013-10-11 19:48:06 +0530 |
|---|---|---|
| committer | Bharat Nihalani <bnihalani@nvidia.com> | 2013-10-17 22:04:19 -0700 |
| commit | 7fd947e48672f4a9695db953d3f746f4359c0600 (patch) | |
| tree | 1ce9157b07bdcfc0c217994bd7639d6d5b503e18 /sound | |
| parent | b7b6de94d491c8fca5a3ea68d91e5b840efc1e82 (diff) | |
Asoc: tegra: rt5639/40: Fix edp manager issue
Handle the case when edp manager is not
present.
Bug 1383175
Change-Id: Iaa9e691836c4644ecf5cfafcfcafddee839c3161
Signed-off-by: Manoj Gangwal <mgangwal@nvidia.com>
Reviewed-on: http://git-master/r/289880
Reviewed-by: Dara Ramesh <dramesh@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra_rt5639.c | 2 | ||||
| -rw-r--r-- | sound/soc/tegra/tegra_rt5640.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/tegra/tegra_rt5639.c b/sound/soc/tegra/tegra_rt5639.c index 663ae85ff478..9ccd2f20e13f 100644 --- a/sound/soc/tegra/tegra_rt5639.c +++ b/sound/soc/tegra/tegra_rt5639.c @@ -1104,6 +1104,8 @@ static int tegra_rt5639_driver_probe(struct platform_device *pdev) battery_manager = edp_get_manager("battery"); if (!battery_manager) { dev_err(&pdev->dev, "unable to get edp manager\n"); + devm_kfree(&pdev->dev, machine->spk_edp_client); + machine->spk_edp_client = NULL; } else { /* register speaker edp client */ ret = edp_register_client(battery_manager, diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c index e40067ac7b86..67bed116bb4b 100644 --- a/sound/soc/tegra/tegra_rt5640.c +++ b/sound/soc/tegra/tegra_rt5640.c @@ -1100,6 +1100,8 @@ static int tegra_rt5640_driver_probe(struct platform_device *pdev) battery_manager = edp_get_manager("battery"); if (!battery_manager) { + devm_kfree(&pdev->dev, machine->spk_edp_client); + machine->spk_edp_client = NULL; dev_err(&pdev->dev, "unable to get edp manager\n"); } else { /* register speaker edp client */ |