Modified: trunk/sound/soc/blackfin/bf5xx-i2s.c (6485 => 6486)
--- trunk/sound/soc/blackfin/bf5xx-i2s.c 2009-05-27 08:47:00 UTC (rev 6485)
+++ trunk/sound/soc/blackfin/bf5xx-i2s.c 2009-05-27 08:56:16 UTC (rev 6486)
@@ -49,7 +49,7 @@
u16 rcr1;
u16 tcr2;
u16 rcr2;
- int configured;
+ int counter;
};
static struct bf5xx_i2s_port bf5xx_i2s;
@@ -132,6 +132,15 @@
return ret;
}
+static int bf5xx_i2s_startup(struct snd_pcm_substream *substream)
+{
+ pr_debug("%s enter\n", __func__);
+
+ /*this counter is used for counting how many pcm streams are opened*/
+ bf5xx_i2s.counter++;
+ return 0;
+}
+
static int bf5xx_i2s_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{
@@ -157,7 +166,7 @@
break;
}
- if (!bf5xx_i2s.configured) {
+ if (bf5xx_i2s.counter == 1) {
/*
* TX and RX are not independent,they are enabled at the
* same time, even if only one side is running. So, we
@@ -179,12 +188,17 @@
pr_err("SPORT is busy!\n");
return -EBUSY;
}
- bf5xx_i2s.configured = 1;
}
return 0;
}
+static void bf5xx_i2s_shutdown(struct snd_pcm_substream *substream)
+{
+ pr_debug("%s enter\n", __func__);
+ bf5xx_i2s.counter--;
+}
+
static int bf5xx_i2s_probe(struct platform_device *pdev,
struct snd_soc_dai *dai)
{
@@ -291,6 +305,8 @@
.rates = BF5XX_I2S_RATES,
.formats = BF5XX_I2S_FORMATS,},
.ops = {
+ .startup = bf5xx_i2s_startup,
+ .shutdown = bf5xx_i2s_shutdown,
.hw_params = bf5xx_i2s_hw_params,},
.dai_ops = {
.set_fmt = bf5xx_i2s_set_dai_fmt,
