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
92ea42f4
Commit
92ea42f4
authored
Feb 06, 2008
by
Mauro Carvalho Chehab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
V4L/DVB (7164): em28xx-alsa: Add a missing mutex
Signed-off-by:
Mauro Carvalho Chehab
<
mchehab@infradead.org
>
parent
00b8730f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
drivers/media/video/em28xx/em28xx-audio.c
drivers/media/video/em28xx/em28xx-audio.c
+5
-0
drivers/media/video/em28xx/em28xx.h
drivers/media/video/em28xx/em28xx.h
+0
-1
No files found.
drivers/media/video/em28xx/em28xx-audio.c
View file @
92ea42f4
...
@@ -269,8 +269,11 @@ static int snd_em28xx_capture_open(struct snd_pcm_substream *substream)
...
@@ -269,8 +269,11 @@ static int snd_em28xx_capture_open(struct snd_pcm_substream *substream)
dprintk
(
"opening device and trying to acquire exclusive lock
\n
"
);
dprintk
(
"opening device and trying to acquire exclusive lock
\n
"
);
/* Sets volume, mute, etc */
/* Sets volume, mute, etc */
dev
->
mute
=
0
;
dev
->
mute
=
0
;
mutex_lock
(
&
dev
->
lock
);
ret
=
em28xx_audio_analog_set
(
dev
);
ret
=
em28xx_audio_analog_set
(
dev
);
mutex_unlock
(
&
dev
->
lock
);
if
(
ret
<
0
)
if
(
ret
<
0
)
goto
err
;
goto
err
;
...
@@ -302,7 +305,9 @@ static int snd_em28xx_pcm_close(struct snd_pcm_substream *substream)
...
@@ -302,7 +305,9 @@ static int snd_em28xx_pcm_close(struct snd_pcm_substream *substream)
dprintk
(
"closing device
\n
"
);
dprintk
(
"closing device
\n
"
);
dev
->
mute
=
1
;
dev
->
mute
=
1
;
mutex_lock
(
&
dev
->
lock
);
em28xx_audio_analog_set
(
dev
);
em28xx_audio_analog_set
(
dev
);
mutex_unlock
(
&
dev
->
lock
);
if
(
dev
->
adev
->
users
==
0
&&
dev
->
adev
->
shutdown
==
1
)
{
if
(
dev
->
adev
->
users
==
0
&&
dev
->
adev
->
shutdown
==
1
)
{
dprintk
(
"audio users: %d
\n
"
,
dev
->
adev
->
users
);
dprintk
(
"audio users: %d
\n
"
,
dev
->
adev
->
users
);
...
...
drivers/media/video/em28xx/em28xx.h
View file @
92ea42f4
...
@@ -345,7 +345,6 @@ int em28xx_read_reg(struct em28xx *dev, u16 reg);
...
@@ -345,7 +345,6 @@ int em28xx_read_reg(struct em28xx *dev, u16 reg);
int
em28xx_write_regs_req
(
struct
em28xx
*
dev
,
u8
req
,
u16
reg
,
char
*
buf
,
int
em28xx_write_regs_req
(
struct
em28xx
*
dev
,
u8
req
,
u16
reg
,
char
*
buf
,
int
len
);
int
len
);
int
em28xx_write_regs
(
struct
em28xx
*
dev
,
u16
reg
,
char
*
buf
,
int
len
);
int
em28xx_write_regs
(
struct
em28xx
*
dev
,
u16
reg
,
char
*
buf
,
int
len
);
int
em28xx_set_audio_source
(
struct
em28xx
*
dev
);
int
em28xx_audio_analog_set
(
struct
em28xx
*
dev
);
int
em28xx_audio_analog_set
(
struct
em28xx
*
dev
);
int
em28xx_colorlevels_set_default
(
struct
em28xx
*
dev
);
int
em28xx_colorlevels_set_default
(
struct
em28xx
*
dev
);
...
...
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