From: Johan Hedberg Date: Fri, 28 Feb 2014 18:26:12 +0000 (+0200) Subject: Bluetooth: Fix trying to disable scanning twice X-Git-Tag: v3.15-rc1~113^2~159^2^2~37^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=317ac8cb3f9fb58b9ec5764b766a449004ab2a62;p=pandora-kernel.git Bluetooth: Fix trying to disable scanning twice The discovery process has a timer for disabling scanning, however scanning might be disabled through other means too like the auto-connect process. We should therefore ensure that the timer is never active after sending a HCI command to disable scanning. There was some existing code in stop_scan_complete trying to avoid the timer when a connect request interrupts a discovery procedure, but the other way around was not covered. This patch covers both scenarios by canceling the timer as soon as we get a successful command complete for the disabling HCI command. Signed-off-by: Johan Hedberg Signed-off-by: Marcel Holtmann --- Reading git-diff-tree failed