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
29998eb6
Commit
29998eb6
authored
Dec 10, 2012
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/max9768' into asoc-next
parents
4301aecb
8f255e7b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
5 deletions
+2
-5
sound/soc/codecs/max9768.c
sound/soc/codecs/max9768.c
+2
-5
No files found.
sound/soc/codecs/max9768.c
View file @
29998eb6
...
...
@@ -187,7 +187,7 @@ static int __devinit max9768_i2c_probe(struct i2c_client *client,
i2c_set_clientdata
(
client
,
max9768
);
max9768
->
regmap
=
regmap_init_i2c
(
client
,
&
max9768_i2c_regmap_config
);
max9768
->
regmap
=
devm_
regmap_init_i2c
(
client
,
&
max9768_i2c_regmap_config
);
if
(
IS_ERR
(
max9768
->
regmap
))
{
err
=
PTR_ERR
(
max9768
->
regmap
);
goto
err_gpio_free
;
...
...
@@ -195,12 +195,10 @@ static int __devinit max9768_i2c_probe(struct i2c_client *client,
err
=
snd_soc_register_codec
(
&
client
->
dev
,
&
max9768_codec_driver
,
NULL
,
0
);
if
(
err
)
goto
err_
regmap
_free
;
goto
err_
gpio
_free
;
return
0
;
err_regmap_free:
regmap_exit
(
max9768
->
regmap
);
err_gpio_free:
if
(
gpio_is_valid
(
max9768
->
shdn_gpio
))
gpio_free
(
max9768
->
shdn_gpio
);
...
...
@@ -215,7 +213,6 @@ static int __devexit max9768_i2c_remove(struct i2c_client *client)
struct
max9768
*
max9768
=
i2c_get_clientdata
(
client
);
snd_soc_unregister_codec
(
&
client
->
dev
);
regmap_exit
(
max9768
->
regmap
);
if
(
gpio_is_valid
(
max9768
->
shdn_gpio
))
gpio_free
(
max9768
->
shdn_gpio
);
...
...
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