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
649e5fb0
Commit
649e5fb0
authored
Nov 29, 2010
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-2.6.37' into for-2.6.38
parents
df0701bb
39a54555
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
9 deletions
+12
-9
sound/soc/fsl/mpc8610_hpcd.c
sound/soc/fsl/mpc8610_hpcd.c
+1
-0
sound/soc/fsl/p1022_ds.c
sound/soc/fsl/p1022_ds.c
+1
-0
sound/soc/nuc900/nuc900-ac97.c
sound/soc/nuc900/nuc900-ac97.c
+7
-8
sound/soc/nuc900/nuc900-audio.h
sound/soc/nuc900/nuc900-audio.h
+2
-0
sound/soc/nuc900/nuc900-pcm.c
sound/soc/nuc900/nuc900-pcm.c
+1
-1
No files found.
sound/soc/fsl/mpc8610_hpcd.c
View file @
649e5fb0
...
...
@@ -498,6 +498,7 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
dev_err
(
&
pdev
->
dev
,
"platform device add failed
\n
"
);
goto
error
;
}
dev_set_drvdata
(
&
pdev
->
dev
,
sound_device
);
of_node_put
(
codec_np
);
...
...
sound/soc/fsl/p1022_ds.c
View file @
649e5fb0
...
...
@@ -498,6 +498,7 @@ static int p1022_ds_probe(struct platform_device *pdev)
dev_err
(
&
pdev
->
dev
,
"platform device add failed
\n
"
);
goto
error
;
}
dev_set_drvdata
(
&
pdev
->
dev
,
sound_device
);
of_node_put
(
codec_np
);
...
...
sound/soc/nuc900/nuc900-ac97.c
View file @
649e5fb0
...
...
@@ -49,7 +49,7 @@ static unsigned short nuc900_ac97_read(struct snd_ac97 *ac97,
mutex_lock
(
&
ac97_mutex
);
val
=
nuc900_checkready
();
if
(
!!
val
)
{
if
(
val
)
{
dev_err
(
nuc900_audio
->
dev
,
"AC97 codec is not ready
\n
"
);
goto
out
;
}
...
...
@@ -102,7 +102,7 @@ static void nuc900_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
mutex_lock
(
&
ac97_mutex
);
tmp
=
nuc900_checkready
();
if
(
!!
tmp
)
if
(
tmp
)
dev_err
(
nuc900_audio
->
dev
,
"AC97 codec is not ready
\n
"
);
/* clear the R_WB bit and write register index */
...
...
@@ -149,7 +149,7 @@ static void nuc900_ac97_warm_reset(struct snd_ac97 *ac97)
udelay
(
100
);
val
=
nuc900_checkready
();
if
(
!!
val
)
if
(
val
)
dev_err
(
nuc900_audio
->
dev
,
"AC97 codec is not ready
\n
"
);
mutex_unlock
(
&
ac97_mutex
);
...
...
@@ -263,8 +263,7 @@ static int nuc900_ac97_trigger(struct snd_pcm_substream *substream,
return
ret
;
}
static
int
nuc900_ac97_probe
(
struct
platform_device
*
pdev
,
struct
snd_soc_dai
*
dai
)
static
int
nuc900_ac97_probe
(
struct
snd_soc_dai
*
dai
)
{
struct
nuc900_audio
*
nuc900_audio
=
nuc900_ac97_data
;
unsigned
long
val
;
...
...
@@ -284,12 +283,12 @@ static int nuc900_ac97_probe(struct platform_device *pdev,
return
0
;
}
static
void
nuc900_ac97_remove
(
struct
platform_device
*
pdev
,
struct
snd_soc_dai
*
dai
)
static
int
nuc900_ac97_remove
(
struct
snd_soc_dai
*
dai
)
{
struct
nuc900_audio
*
nuc900_audio
=
nuc900_ac97_data
;
clk_disable
(
nuc900_audio
->
clk
);
return
0
;
}
static
struct
snd_soc_dai_ops
nuc900_ac97_dai_ops
=
{
...
...
@@ -313,7 +312,7 @@ static struct snd_soc_dai_driver nuc900_ac97_dai = {
.
channels_max
=
2
,
},
.
ops
=
&
nuc900_ac97_dai_ops
,
}
}
;
static
int
__devinit
nuc900_ac97_drvprobe
(
struct
platform_device
*
pdev
)
{
...
...
sound/soc/nuc900/nuc900-audio.h
View file @
649e5fb0
...
...
@@ -110,4 +110,6 @@ struct nuc900_audio {
};
extern
struct
nuc900_audio
*
nuc900_ac97_data
;
#endif
/*end _NUC900_AUDIO_H */
sound/soc/nuc900/nuc900-pcm.c
View file @
649e5fb0
...
...
@@ -332,7 +332,7 @@ static struct snd_soc_platform_driver nuc900_soc_platform = {
.
ops
=
&
nuc900_dma_ops
,
.
pcm_new
=
nuc900_dma_new
,
.
pcm_free
=
nuc900_dma_free_dma_buffers
,
}
}
;
static
int
__devinit
nuc900_soc_platform_probe
(
struct
platform_device
*
pdev
)
{
...
...
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