summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorScott Peterson <speterson@nvidia.com>2013-06-07 14:44:55 -0700
committerHarshada Kale <hkale@nvidia.com>2013-06-10 07:35:51 -0700
commit1aee915bee085bd01b58d862a29e9fe8fbfa7860 (patch)
treeaa27020a8a636c78c346ef153fbe6be9ffc85f28 /sound
parentb62ddb11c0b68fc563dbb0f5f709268d1bb6c4ae (diff)
asoc: tegra: Roth: check NULL pointers
Check for NULL pointer in audio driver to avoid crash when powering down tfa8997 device. Bug 1300642 Change-Id: I367483a82e03aff5c02c398724cfa61a86cc94e3 Signed-off-by: Scott Peterson <speterson@nvidia.com> Reviewed-on: http://git-master/r/236901 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Rahul Mittal <rmittal@nvidia.com> Tested-by: Rahul Mittal <rmittal@nvidia.com> Reviewed-by: Niranjan Wartikar <nwartikar@nvidia.com> Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/tegra/tegra_rt5640.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c
index 8bf7c1034d34..873330a1b194 100644
--- a/sound/soc/tegra/tegra_rt5640.c
+++ b/sound/soc/tegra/tegra_rt5640.c
@@ -558,7 +558,7 @@ static int tegra_set_tfa9887_powerdown(struct snd_kcontrol *kcontrol,
data->tfa9887_powerdown = ucontrol->value.integer.value[0];
//printk("tegra_set_tfa9887_powerdown powerdown=%d ref=%d\n",data->tfa9887_powerdown,i2s_tfa->playback_ref_count);
- if (i2s_tfa->playback_ref_count <= 1) {
+ if (i2s_tfa && (i2s_tfa->playback_ref_count <= 1)) {
Tfa9887_Powerdown(data->tfa9887_powerdown);
machine->tfa9887_on = !data->tfa9887_powerdown;
}