Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 206592
b: refs/heads/master
c: 8ff2361
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and Mark Brown committed Jul 13, 2010
1 parent 4b2a770 commit 8925624
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 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: 4d53952a396d7fcde295b6eedee1f588dfb8464c
refs/heads/master: 8ff23610a6c2ec8abaab6ae14d9ed8f59c1f944c
6 changes: 2 additions & 4 deletions trunk/sound/soc/blackfin/bf5xx-ac97.c
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,7 @@ EXPORT_SYMBOL_GPL(soc_ac97_ops);
#ifdef CONFIG_PM
static int bf5xx_ac97_suspend(struct snd_soc_dai *dai)
{
struct sport_device *sport =
(struct sport_device *)dai->private_data;
struct sport_device *sport = dai->private_data;

pr_debug("%s : sport %d\n", __func__, dai->id);
if (!dai->active)
Expand All @@ -271,8 +270,7 @@ static int bf5xx_ac97_suspend(struct snd_soc_dai *dai)
static int bf5xx_ac97_resume(struct snd_soc_dai *dai)
{
int ret;
struct sport_device *sport =
(struct sport_device *)dai->private_data;
struct sport_device *sport = dai->private_data;

pr_debug("%s : sport %d\n", __func__, dai->id);
if (!dai->active)
Expand Down
6 changes: 2 additions & 4 deletions trunk/sound/soc/blackfin/bf5xx-tdm.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,7 @@ static int bf5xx_tdm_set_channel_map(struct snd_soc_dai *dai,
#ifdef CONFIG_PM
static int bf5xx_tdm_suspend(struct snd_soc_dai *dai)
{
struct sport_device *sport =
(struct sport_device *)dai->private_data;
struct sport_device *sport = dai->private_data;

if (!dai->active)
return 0;
Expand All @@ -225,8 +224,7 @@ static int bf5xx_tdm_suspend(struct snd_soc_dai *dai)
static int bf5xx_tdm_resume(struct snd_soc_dai *dai)
{
int ret;
struct sport_device *sport =
(struct sport_device *)dai->private_data;
struct sport_device *sport = dai->private_data;

if (!dai->active)
return 0;
Expand Down

0 comments on commit 8925624

Please sign in to comment.