diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-05 13:17:01 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-05 13:17:01 +0400 |
| commit | e71981343ad29b5d929f82ac56c0b27b8ea0e540 (patch) | |
| tree | 47135be4252faecbc0e5508658a58f8afd197fff /sound/soc/blackfin/bf5xx-tdm.c | |
| parent | 2603798070a80d76e7e6d2992ba4ec74addcec90 (diff) | |
| parent | bda7d2a862e6b788bca2d02d38a07966a9c92e48 (diff) | |
| download | linux-e71981343ad29b5d929f82ac56c0b27b8ea0e540.tar.xz | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/blackfin/bf5xx-tdm.c')
| -rw-r--r-- | sound/soc/blackfin/bf5xx-tdm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/blackfin/bf5xx-tdm.c b/sound/soc/blackfin/bf5xx-tdm.c index 4b360124083e..24c14269f4bc 100644 --- a/sound/soc/blackfin/bf5xx-tdm.c +++ b/sound/soc/blackfin/bf5xx-tdm.c @@ -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; @@ -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; |