From 89170f316642e5b8b19f9e51744a7dadadc0eab9 Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Fri, 14 Oct 2011 15:54:19 -0700 Subject: [PATCH] --- yaml --- r: 270882 b: refs/heads/master c: 01840bbe5f4406bf1d24590b96b0e3df43aaa81a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/tegra/tegra_das.c | 4 ++-- trunk/sound/soc/tegra/tegra_pcm.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6c9430cc4c88..288ba07d5e92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 535bd16f4190d6868661c7f5d61cb4cbd64cd94c +refs/heads/master: 01840bbe5f4406bf1d24590b96b0e3df43aaa81a diff --git a/trunk/sound/soc/tegra/tegra_das.c b/trunk/sound/soc/tegra/tegra_das.c index 9f24ef73f2cb..3b55a44146af 100644 --- a/trunk/sound/soc/tegra/tegra_das.c +++ b/trunk/sound/soc/tegra/tegra_das.c @@ -212,7 +212,7 @@ static int __devinit tegra_das_probe(struct platform_device *pdev) release_mem_region(res->start, resource_size(res)); err_free: kfree(das); - das = 0; + das = NULL; exit: return ret; } @@ -234,7 +234,7 @@ static int __devexit tegra_das_remove(struct platform_device *pdev) release_mem_region(res->start, resource_size(res)); kfree(das); - das = 0; + das = NULL; return 0; } diff --git a/trunk/sound/soc/tegra/tegra_pcm.c b/trunk/sound/soc/tegra/tegra_pcm.c index c7cfd96e991e..436def1dfa39 100644 --- a/trunk/sound/soc/tegra/tegra_pcm.c +++ b/trunk/sound/soc/tegra/tegra_pcm.c @@ -367,7 +367,7 @@ static void tegra_pcm_free(struct snd_pcm *pcm) tegra_pcm_deallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_PLAYBACK); } -struct snd_soc_platform_driver tegra_pcm_platform = { +static struct snd_soc_platform_driver tegra_pcm_platform = { .ops = &tegra_pcm_ops, .pcm_new = tegra_pcm_new, .pcm_free = tegra_pcm_free,