From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 15 Oct 2013 15:28:51 +0000 (-0700)
Subject: Bluetooth: Simplify the code for re-arming discoverable timeout
X-Git-Tag: v3.13-rc1~105^2~23^2^2~4^2~95
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36261547c9699c6bc746b1db9508aaeb68faa7c9;p=pandora-kernel.git

Bluetooth: Simplify the code for re-arming discoverable timeout

When only the discoverable timeout gets updated, just cancel the current
timeout, store the new timeout value. If the new timeout is valid, then
arm the discoverable timeout again.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---

Reading git-diff-tree failed