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
a74306fe
Commit
a74306fe
authored
Aug 24, 2016
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
parents
b5db6c57
979cf59a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
sound/soc/intel/skylake/skl-sst-utils.c
sound/soc/intel/skylake/skl-sst-utils.c
+5
-0
sound/soc/intel/skylake/skl.c
sound/soc/intel/skylake/skl.c
+3
-1
No files found.
sound/soc/intel/skylake/skl-sst-utils.c
View file @
a74306fe
...
@@ -123,6 +123,11 @@ int snd_skl_get_module_info(struct skl_sst *ctx, u8 *uuid,
...
@@ -123,6 +123,11 @@ int snd_skl_get_module_info(struct skl_sst *ctx, u8 *uuid,
uuid_mod
=
(
uuid_le
*
)
uuid
;
uuid_mod
=
(
uuid_le
*
)
uuid
;
if
(
list_empty
(
&
ctx
->
uuid_list
))
{
dev_err
(
ctx
->
dev
,
"Module list is empty
\n
"
);
return
-
EINVAL
;
}
list_for_each_entry
(
module
,
&
ctx
->
uuid_list
,
list
)
{
list_for_each_entry
(
module
,
&
ctx
->
uuid_list
,
list
)
{
if
(
uuid_le_cmp
(
*
uuid_mod
,
module
->
uuid
)
==
0
)
{
if
(
uuid_le_cmp
(
*
uuid_mod
,
module
->
uuid
)
==
0
)
{
dfw_config
->
module_id
=
module
->
id
;
dfw_config
->
module_id
=
module
->
id
;
...
...
sound/soc/intel/skylake/skl.c
View file @
a74306fe
...
@@ -672,8 +672,10 @@ static int skl_probe(struct pci_dev *pci,
...
@@ -672,8 +672,10 @@ static int skl_probe(struct pci_dev *pci,
skl
->
nhlt
=
skl_nhlt_init
(
bus
->
dev
);
skl
->
nhlt
=
skl_nhlt_init
(
bus
->
dev
);
if
(
skl
->
nhlt
==
NULL
)
if
(
skl
->
nhlt
==
NULL
)
{
err
=
-
ENODEV
;
goto
out_free
;
goto
out_free
;
}
skl_nhlt_update_topology_bin
(
skl
);
skl_nhlt_update_topology_bin
(
skl
);
...
...
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