From 44346e76641f9e4bae9bbcfeb2b05a97190adb59 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 12 Jul 2010 13:50:27 -0700
Subject: [PATCH] --- yaml --- r: 206593 b: refs/heads/master c:
 4726a57b8c1ba398399fe69b56dc97c196ab4f6b h: refs/heads/master i:   206591:
 4b2a7709969c8d5e3f8ec0927b63aff0632a33aa v: v3

---
 [refs]                                | 2 +-
 trunk/sound/soc/davinci/davinci-pcm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 53e800c8551c..b478f30a11f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ff23610a6c2ec8abaab6ae14d9ed8f59c1f944c
+refs/heads/master: 4726a57b8c1ba398399fe69b56dc97c196ab4f6b
diff --git a/trunk/sound/soc/davinci/davinci-pcm.c b/trunk/sound/soc/davinci/davinci-pcm.c
index 2dc406f42fe7..def454e42fcb 100644
--- a/trunk/sound/soc/davinci/davinci-pcm.c
+++ b/trunk/sound/soc/davinci/davinci-pcm.c
@@ -800,7 +800,7 @@ static void davinci_pcm_free(struct snd_pcm *pcm)
 		dma_free_writecombine(pcm->card->dev, buf->bytes,
 				      buf->area, buf->addr);
 		buf->area = NULL;
-		iram_dma = (struct snd_dma_buffer *)buf->private_data;
+		iram_dma = buf->private_data;
 		if (iram_dma) {
 			sram_free(iram_dma->area, iram_dma->bytes);
 			kfree(iram_dma);