Skip to content

L
linux
Commit a067c035 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

Merge branch 'for-3.12' into for-next

parents ad81f054 97c4de8f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 783 additions and 4648 deletions
sound/firewire/speakers.c
View file @ a067c035
...@@ -49,7 +49,6 @@ struct fwspk { ...@@ -49,7 +49,6 @@ struct fwspk {
struct snd_card *card; struct snd_card *card;
struct fw_unit *unit; struct fw_unit *unit;
const struct device_info *device_info; const struct device_info *device_info;
struct snd_pcm_substream *pcm;
struct mutex mutex; struct mutex mutex;
struct cmp_connection connection; struct cmp_connection connection;
struct amdtp_out_stream stream; struct amdtp_out_stream stream;
...@@ -363,8 +362,7 @@ static int fwspk_create_pcm(struct fwspk *fwspk) ...@@ -363,8 +362,7 @@ static int fwspk_create_pcm(struct fwspk *fwspk)
return err; return err;
pcm->private_data = fwspk; pcm->private_data = fwspk;
strcpy(pcm->name, fwspk->device_info->short_name); strcpy(pcm->name, fwspk->device_info->short_name);
fwspk->pcm = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &ops);
fwspk->pcm->ops = &ops;
return 0; return 0;
} }
......
sound/pci/hda/patch_analog.c
View file @ a067c035
This source diff could not be displayed because it is too large. You can view the blob instead.
sound/pci/rme9652/hdspm.c
View file @ a067c035
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7