openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'for-3.12' into for-next

This commit is contained in:
Takashi Iwai 2013-07-15 12:09:28 +02:00
parent ad81f0545e 97c4de8fc0
commit a067c035a0
3 changed files with 719 additions and 4584 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/firewire/speakers.c
View File

@ -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;
}

4528
sound/pci/hda/patch_analog.c
View File

File diff suppressed because it is too large Load Diff

771
sound/pci/rme9652/hdspm.c
View File

File diff suppressed because it is too large Load Diff