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
nexedi
linux
Commits
e65f6b1e
Commit
e65f6b1e
authored
Sep 02, 2014
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
parents
69e273c0
4d61b39b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
include/sound/soc.h
include/sound/soc.h
+1
-1
sound/soc/soc-core.c
sound/soc/soc-core.c
+1
-1
No files found.
include/sound/soc.h
View file @
e65f6b1e
...
@@ -277,7 +277,7 @@
...
@@ -277,7 +277,7 @@
.access = SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | \
.access = SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | \
SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, \
SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, \
.tlv.c = (snd_soc_bytes_tlv_callback), \
.tlv.c = (snd_soc_bytes_tlv_callback), \
.info = snd_soc_
info_bytes
_ext, \
.info = snd_soc_
bytes_info
_ext, \
.private_value = (unsigned long)&(struct soc_bytes_ext) \
.private_value = (unsigned long)&(struct soc_bytes_ext) \
{.max = xcount, .get = xhandler_get, .put = xhandler_put, } }
{.max = xcount, .get = xhandler_get, .put = xhandler_put, } }
#define SOC_SINGLE_XR_SX(xname, xregbase, xregcount, xnbits, \
#define SOC_SINGLE_XR_SX(xname, xregbase, xregcount, xnbits, \
...
...
sound/soc/soc-core.c
View file @
e65f6b1e
...
@@ -1325,7 +1325,7 @@ static int soc_post_component_init(struct snd_soc_pcm_runtime *rtd,
...
@@ -1325,7 +1325,7 @@ static int soc_post_component_init(struct snd_soc_pcm_runtime *rtd,
device_initialize
(
rtd
->
dev
);
device_initialize
(
rtd
->
dev
);
rtd
->
dev
->
parent
=
rtd
->
card
->
dev
;
rtd
->
dev
->
parent
=
rtd
->
card
->
dev
;
rtd
->
dev
->
release
=
rtd_release
;
rtd
->
dev
->
release
=
rtd_release
;
rtd
->
dev
->
init_name
=
name
;
dev_set_name
(
rtd
->
dev
,
"%s"
,
name
)
;
dev_set_drvdata
(
rtd
->
dev
,
rtd
);
dev_set_drvdata
(
rtd
->
dev
,
rtd
);
mutex_init
(
&
rtd
->
pcm_mutex
);
mutex_init
(
&
rtd
->
pcm_mutex
);
INIT_LIST_HEAD
(
&
rtd
->
dpcm
[
SNDRV_PCM_STREAM_PLAYBACK
].
be_clients
);
INIT_LIST_HEAD
(
&
rtd
->
dpcm
[
SNDRV_PCM_STREAM_PLAYBACK
].
be_clients
);
...
...
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