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
5a4cfce7
Commit
5a4cfce7
authored
Dec 08, 2010
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-2.6.37' into for-2.6.38
Conflicts: sound/soc/soc-core.c Axel's fix on two different branches.
parents
6b3ed785
2a7b1a00
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
sound/soc/codecs/wm8580.c
sound/soc/codecs/wm8580.c
+4
-4
sound/soc/codecs/wm8962.c
sound/soc/codecs/wm8962.c
+1
-1
No files found.
sound/soc/codecs/wm8580.c
View file @
5a4cfce7
...
...
@@ -491,16 +491,16 @@ static int wm8580_paif_hw_params(struct snd_pcm_substream *substream,
paifa
|=
0x8
;
break
;
case
SNDRV_PCM_FORMAT_S20_3LE
:
paifa
|=
0x
1
0
;
paifa
|=
0x0
;
paifb
|=
WM8580_AIF_LENGTH_20
;
break
;
case
SNDRV_PCM_FORMAT_S24_LE
:
paifa
|=
0x
1
0
;
paifa
|=
0x0
;
paifb
|=
WM8580_AIF_LENGTH_24
;
break
;
case
SNDRV_PCM_FORMAT_S32_LE
:
paifa
|=
0x
1
0
;
paifb
|=
WM8580_AIF_LENGTH_
24
;
paifa
|=
0x0
;
paifb
|=
WM8580_AIF_LENGTH_
32
;
break
;
default:
return
-
EINVAL
;
...
...
sound/soc/codecs/wm8962.c
View file @
5a4cfce7
...
...
@@ -3339,7 +3339,7 @@ static irqreturn_t wm8962_irq(int irq, void *data)
int
mask
;
int
active
;
mask
=
snd_soc_read
(
codec
,
WM8962_INTERRUPT_STATUS_2
);
mask
=
snd_soc_read
(
codec
,
WM8962_INTERRUPT_STATUS_2
_MASK
);
active
=
snd_soc_read
(
codec
,
WM8962_INTERRUPT_STATUS_2
);
active
&=
~
mask
;
...
...
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