Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 305578
b: refs/heads/master
c: 0841b04
h: refs/heads/master
v: v3
  • Loading branch information
Mark Brown committed Apr 2, 2012
1 parent 77803d4 commit 84ee591
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dbf7a733f5fb9da9de750716ec7c7615c30cbfb8
refs/heads/master: 0841b04a5ffba5bd5a7f5b49f014adaf639bf3a4
4 changes: 2 additions & 2 deletions trunk/sound/soc/codecs/max98095.c
Original file line number Diff line number Diff line change
Expand Up @@ -2226,8 +2226,8 @@ int max98095_jack_detect_enable(struct snd_soc_codec *codec)
if (max98095->pdata->jack_detect_pin5en)
detect_enable |= M98095_PIN5EN;

if (max98095->jack_detect_delay)
slew = max98095->jack_detect_delay;
if (max98095->pdata->jack_detect_delay)
slew = max98095->pdata->jack_detect_delay;

ret = snd_soc_write(codec, M98095_08E_JACK_DC_SLEW, slew);
if (ret < 0) {
Expand Down

0 comments on commit 84ee591

Please sign in to comment.