diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-11-26 20:08:40 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-11-26 20:08:40 +0200 |
| commit | 7fa0fd3049a4034fc347d7035d56ca1682a24856 (patch) | |
| tree | e9f50081b7c30af0880bf8e381c02ecff6207f75 /audio/unix.c | |
| parent | b892677f0ba83e28daf6c05561295c1145d1c59f (diff) | |
| parent | 09d691ffa7e3d873c140aa05a4c2d6c888e1d769 (diff) | |
Merge branch 'for-upstream' of git://gitorious.org/bluez/vudentzs-clone into vudentz
Diffstat (limited to 'audio/unix.c')
| -rw-r--r-- | audio/unix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/unix.c b/audio/unix.c index eeb4a5d6..921e15ef 100644 --- a/audio/unix.c +++ b/audio/unix.c @@ -650,7 +650,7 @@ static void start_config(struct audio_device *dev, struct unix_client *client) break; } - id = headset_suspend_stream(dev, headset_setup_complete, + id = headset_config_stream(dev, headset_setup_complete, hs->lock, client); client->cancel = headset_cancel_stream; break; @@ -763,7 +763,7 @@ static void start_suspend(struct audio_device *dev, struct unix_client *client) hs = &client->d.hs; id = headset_suspend_stream(dev, headset_suspend_complete, - ~hs->lock, client); + hs->lock, client); client->cancel = headset_cancel_stream; break; |