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
7196be58
Commit
7196be58
authored
Aug 04, 2014
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
parents
a1cb98ac
0e400c53
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
1 deletion
+17
-1
MAINTAINERS
MAINTAINERS
+7
-0
include/sound/soc.h
include/sound/soc.h
+2
-0
sound/soc/soc-core.c
sound/soc/soc-core.c
+8
-1
No files found.
MAINTAINERS
View file @
7196be58
...
...
@@ -7479,6 +7479,13 @@ F: drivers/rtc/
F: include/linux/rtc.h
F: include/uapi/linux/rtc.h
REALTEK AUDIO CODECS
M: Bard Liao <bardliao@realtek.com>
M: Oder Chiou <oder_chiou@realtek.com>
S: Maintained
F: sound/soc/codecs/rt*
F: include/sound/rt*.h
REISERFS FILE SYSTEM
L: reiserfs-devel@vger.kernel.org
S: Supported
...
...
include/sound/soc.h
View file @
7196be58
...
...
@@ -248,6 +248,8 @@
.info = snd_soc_info_enum_double, \
.get = xhandler_get, .put = xhandler_put, \
.private_value = (unsigned long)&xenum }
#define SOC_VALUE_ENUM_EXT(xname, xenum, xhandler_get, xhandler_put) \
SOC_ENUM_EXT(xname, xenum, xhandler_get, xhandler_put)
#define SND_SOC_BYTES(xname, xbase, xregs) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
...
...
sound/soc/soc-core.c
View file @
7196be58
...
...
@@ -4518,9 +4518,16 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_codec);
int
snd_soc_of_parse_card_name
(
struct
snd_soc_card
*
card
,
const
char
*
propname
)
{
struct
device_node
*
np
=
card
->
dev
->
of_node
;
struct
device_node
*
np
;
int
ret
;
if
(
!
card
->
dev
)
{
pr_err
(
"card->dev is not set before calling %s
\n
"
,
__func__
);
return
-
EINVAL
;
}
np
=
card
->
dev
->
of_node
;
ret
=
of_property_read_string_index
(
np
,
propname
,
0
,
&
card
->
name
);
/*
* EINVAL means the property does not exist. This is fine providing
...
...
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