From 53167ebe7164cb5a28d4154a054992ea7040ffd8 Mon Sep 17 00:00:00 2001
From: "Adam M. Dutko" <dutko.adam@gmail.com>
Date: Thu, 23 Jun 2011 11:57:45 -0300
Subject: [PATCH] --- yaml --- r: 261539 b: refs/heads/master c:
 37f9619dd5df9f1c9878ac53e27033519b8760ec h: refs/heads/master i:   261537:
 8989d4d7799ad986c277a51ebf89e138c1567786   261535:
 f100f04274ac2ecbd7ae9ac1fd19eb2f91cdc41a v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/staging/tm6000/tm6000-alsa.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 356697bbb080..dfaa0bcfa0ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51b6d717fb8e261e9705d66351f425561f114d4b
+refs/heads/master: 37f9619dd5df9f1c9878ac53e27033519b8760ec
diff --git a/trunk/drivers/staging/tm6000/tm6000-alsa.c b/trunk/drivers/staging/tm6000/tm6000-alsa.c
index a588f299af49..018ff73ab71d 100644
--- a/trunk/drivers/staging/tm6000/tm6000-alsa.c
+++ b/trunk/drivers/staging/tm6000/tm6000-alsa.c
@@ -18,7 +18,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 
-#include <asm/delay.h>
+#include <linux/delay.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -84,7 +84,6 @@ static int _tm6000_start_audio_dma(struct snd_tm6000_card *chip)
 
 	tm6000_set_audio_bitrate(core, 48000);
 
-
 	return 0;
 }
 
@@ -123,6 +122,7 @@ static int dsp_buffer_alloc(struct snd_pcm_substream *substream, int size)
 	if (substream->runtime->dma_area) {
 		if (substream->runtime->dma_bytes > size)
 			return 0;
+
 		dsp_buffer_free(substream);
 	}
 
@@ -152,9 +152,9 @@ static struct snd_pcm_hardware snd_tm6000_digital_hw = {
 		SNDRV_PCM_INFO_MMAP_VALID,
 	.formats = SNDRV_PCM_FMTBIT_S16_LE,
 
-	.rates =		SNDRV_PCM_RATE_CONTINUOUS,
-	.rate_min =		48000,
-	.rate_max =		48000,
+	.rates = SNDRV_PCM_RATE_CONTINUOUS,
+	.rate_min = 48000,
+	.rate_max = 48000,
 	.channels_min = 2,
 	.channels_max = 2,
 	.period_bytes_min = 64,
@@ -457,7 +457,7 @@ int tm6000_audio_init(struct tm6000_core *dev)
 	if (rc < 0)
 		goto error_chip;
 
-	dprintk(1,"Registered audio driver for %s\n", card->longname);
+	dprintk(1, "Registered audio driver for %s\n", card->longname);
 
 	return 0;