bluez-bt_cancel_discovery.patch

   1 From: Johan Hedberg <johan.hedberg@nokia.com>
   2 Date: Mon, 8 Jun 2009 04:06:33 +0000 (+0700)
   3 Subject: Fix bt_cancel_discovery calls in case of SDP failures
   4 X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez.git;a=commitdiff_plain;h=9d7f87e0e8693b3645da5d66dec736d1ee3e9359
   5
   6 Fix bt_cancel_discovery calls in case of SDP failures
   7
   8 We shouldn't call bt_cancel_discovery if we're withing a SDP callback so
   9 always make sure that p->svclass is 0 before calling
  10 pending_connect_finalize (which uses this value to determine whether
  11 cancelation is needed). The glib-helper.c code should still safeguard
  12 against this too and that's what the previous commit fixes.
  13 ---
  14
  15 diff --git a/audio/headset.c b/audio/headset.c
  16 index 7e689ff..86cce52 100644
  17 --- a/audio/headset.c
  18 +++ b/audio/headset.c
  19 @@ -1456,6 +1456,7 @@ failed_not_supported:
  20         if (p->msg)
  21                 error_not_supported(dev->conn, p->msg);
  22  failed:
  23 +       p->svclass = 0;
  24         pending_connect_finalize(dev);
  25         headset_set_state(dev, HEADSET_STATE_DISCONNECTED);
  26  }