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
74858f23
Commit
74858f23
authored
Nov 08, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-next
parents
5176dfcd
0feb23d1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
2 deletions
+0
-2
sound/soc/codecs/ak4642.c
sound/soc/codecs/ak4642.c
+0
-2
No files found.
sound/soc/codecs/ak4642.c
View file @
74858f23
...
@@ -352,7 +352,6 @@ static int ak4642_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
...
@@ -352,7 +352,6 @@ static int ak4642_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
*/
*/
default:
default:
return
-
EINVAL
;
return
-
EINVAL
;
break
;
}
}
snd_soc_update_bits
(
codec
,
MD_CTL1
,
DIF_MASK
,
data
);
snd_soc_update_bits
(
codec
,
MD_CTL1
,
DIF_MASK
,
data
);
...
@@ -405,7 +404,6 @@ static int ak4642_dai_hw_params(struct snd_pcm_substream *substream,
...
@@ -405,7 +404,6 @@ static int ak4642_dai_hw_params(struct snd_pcm_substream *substream,
break
;
break
;
default:
default:
return
-
EINVAL
;
return
-
EINVAL
;
break
;
}
}
snd_soc_update_bits
(
codec
,
MD_CTL2
,
FS_MASK
,
rate
);
snd_soc_update_bits
(
codec
,
MD_CTL2
,
FS_MASK
,
rate
);
...
...
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