Modified: branches/2009R1/sound/soc/blackfin/bf5xx-ac97.c (6960 => 6961)
--- branches/2009R1/sound/soc/blackfin/bf5xx-ac97.c 2009-07-10 04:31:19 UTC (rev 6960)
+++ branches/2009R1/sound/soc/blackfin/bf5xx-ac97.c 2009-07-10 10:14:45 UTC (rev 6961)
@@ -281,28 +281,24 @@
if (!dai->active)
return 0;
- ret = sport_set_multichannel(sport_handle, 16, 0x1F, 1);
+ ret = sport_set_multichannel(sport, 16, 0x1F, 1);
if (ret) {
pr_err("SPORT is busy!\n");
return -EBUSY;
}
- ret = sport_config_rx(sport_handle, IRFS, 0xF, 0, (16*16-1));
+ ret = sport_config_rx(sport, IRFS, 0xF, 0, (16*16-1));
if (ret) {
pr_err("SPORT is busy!\n");
return -EBUSY;
}
- ret = sport_config_tx(sport_handle, ITFS, 0xF, 0, (16*16-1));
+ ret = sport_config_tx(sport, ITFS, 0xF, 0, (16*16-1));
if (ret) {
pr_err("SPORT is busy!\n");
return -EBUSY;
}
- if (dai->capture.active)
- sport_rx_start(sport);
- if (dai->playback.active)
- sport_tx_start(sport);
return 0;
}
Modified: branches/2009R1/sound/soc/blackfin/bf5xx-i2s.c (6960 => 6961)
--- branches/2009R1/sound/soc/blackfin/bf5xx-i2s.c 2009-07-10 04:31:19 UTC (rev 6960)
+++ branches/2009R1/sound/soc/blackfin/bf5xx-i2s.c 2009-07-10 10:14:45 UTC (rev 6961)
@@ -246,22 +246,18 @@
if (!dai->active)
return 0;
- ret = sport_config_rx(sport_handle, RFSR | RCKFE, RSFSE|0x1f, 0, 0);
+ ret = sport_config_rx(sport, RFSR | RCKFE, RSFSE|0x1f, 0, 0);
if (ret) {
pr_err("SPORT is busy!\n");
return -EBUSY;
}
- ret = sport_config_tx(sport_handle, TFSR | TCKFE, TSFSE|0x1f, 0, 0);
+ ret = sport_config_tx(sport, TFSR | TCKFE, TSFSE|0x1f, 0, 0);
if (ret) {
pr_err("SPORT is busy!\n");
return -EBUSY;
}
- if (dai->capture.active)
- sport_rx_start(sport);
- if (dai->playback.active)
- sport_tx_start(sport);
return 0;
}
