Merge branch 'for-3.12' into for-next
This commit is contained in:
commit
a067c035a0
3 changed files with 719 additions and 4584 deletions
|
@ -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)
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue