alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ASoC: Add missing regmap_init_i2c in wm8804_i2c_probe
@ 2012-03-06  7:06 Axel Lin
  2012-03-06 12:23 ` Mark Brown
  0 siblings, 1 reply; 2+ messages in thread
From: Axel Lin @ 2012-03-06  7:06 UTC (permalink / raw)
  To: alsa-devel; +Cc: Dimitris Papastamos, Mark Brown, Ian Lartey, Liam Girdwood

commit 891271c "ASoC: Convert wm8804 to direct regmap API usage"
only converts wm8804_spi_probe to use regmap_init_spi.

This patch adds missing regmap_init_i2c in wm8804_i2c_probe.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 sound/soc/codecs/wm8804.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
index 7ee8dcf..6bd1b76 100644
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -755,6 +755,12 @@ static __devinit int wm8804_i2c_probe(struct i2c_client *i2c,
 	if (!wm8804)
 		return -ENOMEM;
 
+	wm8804->regmap = regmap_init_i2c(i2c, &wm8804_regmap_config);
+	if (IS_ERR(wm8804->regmap)) {
+		ret = PTR_ERR(wm8804->regmap);
+		return ret;
+	}
+
 	i2c_set_clientdata(i2c, wm8804);
 
 	ret = snd_soc_register_codec(&i2c->dev,
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] ASoC: Add missing regmap_init_i2c in wm8804_i2c_probe
  2012-03-06  7:06 [PATCH] ASoC: Add missing regmap_init_i2c in wm8804_i2c_probe Axel Lin
@ 2012-03-06 12:23 ` Mark Brown
  0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2012-03-06 12:23 UTC (permalink / raw)
  To: Axel Lin; +Cc: Dimitris Papastamos, alsa-devel, Ian Lartey, Liam Girdwood


[-- Attachment #1.1: Type: text/plain, Size: 200 bytes --]

On Tue, Mar 06, 2012 at 03:06:53PM +0800, Axel Lin wrote:
> commit 891271c "ASoC: Convert wm8804 to direct regmap API usage"
> only converts wm8804_spi_probe to use regmap_init_spi.

Applied, thanks.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-03-06 12:23 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-06  7:06 [PATCH] ASoC: Add missing regmap_init_i2c in wm8804_i2c_probe Axel Lin
2012-03-06 12:23 ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).