From: Johan Hedberg <johan.hedberg@intel.com>
Date: Mon, 11 Aug 2014 19:06:42 +0000 (+0300)
Subject: Bluetooth: Move canceling security_timer into smp_chan_destroy()
X-Git-Tag: fixes-against-v3.18-rc2~81^2~133^2~84^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=109ec2309eb996fbe03302fbd40dec9014c6f849;p=pandora-kernel.git

Bluetooth: Move canceling security_timer into smp_chan_destroy()

All places needing to cancel the security timer also call
smp_chan_destroy() in the same go. To eliminate the need to do these two
calls in multiple places simply move the timer cancellation into
smp_chan_destroy().

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

Reading git-diff-tree failed