Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 232084
b: refs/heads/master
c: 950a95d
h: refs/heads/master
v: v3
  • Loading branch information
Barry Song authored and Mark Brown committed Jan 18, 2011
1 parent ccbea75 commit 7b8afa1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e9c2048915048d605fd76539ddd96f00d593e1eb
refs/heads/master: 950a95d4e2e2c3a9fb0daceaaf55b969e4710ce7
8 changes: 4 additions & 4 deletions trunk/sound/soc/blackfin/bf5xx-tdm.c
Original file line number Diff line number Diff line change
Expand Up @@ -235,13 +235,13 @@ static int bf5xx_tdm_resume(struct snd_soc_dai *dai)
ret = -EBUSY;
}

ret = sport_config_rx(sport, IRFS, 0x1F, 0, 0);
ret = sport_config_rx(sport, 0, 0x1F, 0, 0);
if (ret) {
pr_err("SPORT is busy!\n");
ret = -EBUSY;
}

ret = sport_config_tx(sport, ITFS, 0x1F, 0, 0);
ret = sport_config_tx(sport, 0, 0x1F, 0, 0);
if (ret) {
pr_err("SPORT is busy!\n");
ret = -EBUSY;
Expand Down Expand Up @@ -303,14 +303,14 @@ static int __devinit bfin_tdm_probe(struct platform_device *pdev)
goto sport_config_err;
}

ret = sport_config_rx(sport_handle, IRFS, 0x1F, 0, 0);
ret = sport_config_rx(sport_handle, 0, 0x1F, 0, 0);
if (ret) {
pr_err("SPORT is busy!\n");
ret = -EBUSY;
goto sport_config_err;
}

ret = sport_config_tx(sport_handle, ITFS, 0x1F, 0, 0);
ret = sport_config_tx(sport_handle, 0, 0x1F, 0, 0);
if (ret) {
pr_err("SPORT is busy!\n");
ret = -EBUSY;
Expand Down

0 comments on commit 7b8afa1

Please sign in to comment.