Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
a067c035
Commit
a067c035
authored
Jul 15, 2013
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-3.12' into for-next
parents
ad81f054
97c4de8f
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
783 additions
and
4648 deletions
+783
-4648
sound/firewire/speakers.c
sound/firewire/speakers.c
+1
-3
sound/pci/hda/patch_analog.c
sound/pci/hda/patch_analog.c
+244
-4418
sound/pci/rme9652/hdspm.c
sound/pci/rme9652/hdspm.c
+538
-227
No files found.
sound/firewire/speakers.c
View file @
a067c035
...
...
@@ -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
;
}
...
...
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.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment