Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 157523
b: refs/heads/master
c: e2f551d
h: refs/heads/master
i:
  157521: 3b8bd54
  157519: dfc9327
v: v3
  • Loading branch information
Mark Brown committed Jun 25, 2009
1 parent 8ee73ab commit 9452685
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 517374704da44c1ba77c1600714fe214524af286
refs/heads/master: e2f551dacbdff8e40365a989ab66104b03316f4d
17 changes: 17 additions & 0 deletions trunk/sound/soc/codecs/wm8961.c
Original file line number Diff line number Diff line change
Expand Up @@ -1267,6 +1267,21 @@ static __devexit int wm8961_i2c_remove(struct i2c_client *client)
return 0;
}

#ifdef CONFIG_PM
static int wm8961_i2c_suspend(struct i2c_client *client)
{
return snd_soc_suspend_device(&client->dev);
}

static int wm8961_i2c_resume(struct i2c_client *client)
{
return snd_soc_resume_device(&client->dev);
}
#else
#define wm8961_i2c_suspend NULL
#define wm8961_i2c_resume NULL
#endif

static const struct i2c_device_id wm8961_i2c_id[] = {
{ "wm8961", 0 },
{ }
Expand All @@ -1280,6 +1295,8 @@ static struct i2c_driver wm8961_i2c_driver = {
},
.probe = wm8961_i2c_probe,
.remove = __devexit_p(wm8961_i2c_remove),
.suspend = wm8961_i2c_suspend,
.resume = wm8961_i2c_resume,
.id_table = wm8961_i2c_id,
};

Expand Down

0 comments on commit 9452685

Please sign in to comment.