From: Johan Hedberg Date: Wed, 28 Jan 2015 17:56:00 +0000 (+0200) Subject: Bluetooth: Fix check for SSP when enabling SC X-Git-Tag: omap-for-v4.1/prcm-dts-mfd-syscon-fix~134^2~73^2~34 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=592002863a03bd172a19d04854c5ed415693911f;p=pandora-kernel.git Bluetooth: Fix check for SSP when enabling SC There's a check in set_secure_conn() that's supposed to ensure that SSP is enabled before we try to request the controller to enable SC (since SSP is a pre-requisite for it). However, this check only makes sense for controllers actually supporting BR/EDR SC. If we have a 4.0 controller we're only interested in the LE part of SC and should therefore not be requiring SSP to be enabled. This patch adds an additional condition to check for lmp_sc_capable(hdev) before requiring SSP to be enabled. Signed-off-by: Johan Hedberg Signed-off-by: Marcel Holtmann --- Reading git-diff-tree failed