diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-15 12:09:28 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-07-15 12:09:28 +0200 |
| commit | a067c035a0d90b919386aadb545e1630875a3c75 (patch) | |
| tree | 243de0b7de13737c29c10cae1ef01b3feed76b1b /sound/firewire | |
| parent | ad81f0545ef01ea651886dddac4bef6cec930092 (diff) | |
| parent | 97c4de8fc0a47b99220b1209c7457c7dde05637a (diff) | |
| download | linux-a067c035a0d90b919386aadb545e1630875a3c75.tar.bz2 | |
Merge branch 'for-3.12' into for-next
Diffstat (limited to 'sound/firewire')
| -rw-r--r-- | sound/firewire/speakers.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/firewire/speakers.c b/sound/firewire/speakers.c index 2c6386503940..fe9e6e2f2c5b 100644 --- a/sound/firewire/speakers.c +++ b/sound/firewire/speakers.c @@ -49,7 +49,6 @@ struct fwspk { struct snd_card *card; struct fw_unit *unit; const struct device_info *device_info; - struct snd_pcm_substream *pcm; struct mutex mutex; struct cmp_connection connection; struct amdtp_out_stream stream; @@ -363,8 +362,7 @@ static int fwspk_create_pcm(struct fwspk *fwspk) return err; pcm->private_data = fwspk; strcpy(pcm->name, fwspk->device_info->short_name); - fwspk->pcm = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; - fwspk->pcm->ops = &ops; + snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &ops); return 0; } |