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
e66ef2f8
Commit
e66ef2f8
authored
Jan 19, 2011
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-2.6.38' into for-2.6.39
parents
474b62d6
78b3fb46
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8994.c
+1
-1
sound/soc/codecs/wm8995.c
sound/soc/codecs/wm8995.c
+1
-1
No files found.
sound/soc/codecs/wm8994.c
View file @
e66ef2f8
...
...
@@ -2386,7 +2386,7 @@ static int wm8994_set_tristate(struct snd_soc_dai *codec_dai, int tristate)
else
val
=
0
;
return
snd_soc_update_bits
(
codec
,
reg
,
mask
,
reg
);
return
snd_soc_update_bits
(
codec
,
reg
,
mask
,
val
);
}
#define WM8994_RATES SNDRV_PCM_RATE_8000_96000
...
...
sound/soc/codecs/wm8995.c
View file @
e66ef2f8
...
...
@@ -1265,7 +1265,7 @@ static int wm8995_set_tristate(struct snd_soc_dai *codec_dai, int tristate)
else
val
=
0
;
return
snd_soc_update_bits
(
codec
,
reg
,
mask
,
reg
);
return
snd_soc_update_bits
(
codec
,
reg
,
mask
,
val
);
}
/* The size in bits of the FLL divide multiplied by 10
...
...
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