diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-09-14 19:11:13 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-09-14 19:11:13 +0200 |
| commit | 4038a12e7443b5fed3e526c475c38c115d9600f6 (patch) | |
| tree | b39b8fc13c0761459c6bafa1642c6869c4e5747d /sound/soc/soc-jack.c | |
| parent | 2e1210bc3d065a6e26ff5fef228a9a7e08921d2c (diff) | |
| parent | 5013951be88e136d9990ef55303276e2779ce8d8 (diff) | |
| download | linux-4038a12e7443b5fed3e526c475c38c115d9600f6.tar.gz linux-4038a12e7443b5fed3e526c475c38c115d9600f6.tar.bz2 linux-4038a12e7443b5fed3e526c475c38c115d9600f6.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/soc-jack.c')
| -rw-r--r-- | sound/soc/soc-jack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index 38b00131b2fe..fa31d9c2abd8 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c @@ -105,7 +105,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask) snd_soc_dapm_sync(dapm); - snd_jack_report(jack->jack, status); + snd_jack_report(jack->jack, jack->status); out: mutex_unlock(&codec->mutex); |