From: Johan Hedberg Date: Fri, 5 Sep 2014 19:19:49 +0000 (+0300) Subject: Bluetooth: Don't take any action in smp_resume_cb if not encrypted X-Git-Tag: omap-for-v3.19/prcm-cleanup~141^2~144^2~127 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84bc0db53b3a425fb992d5fed25b575e4434167a;p=pandora-kernel.git Bluetooth: Don't take any action in smp_resume_cb if not encrypted When smp_resume_cb is called if we're not encrypted (i.e. the callback wasn't called because the connection became encrypted) we shouldn't take any action at all. This patch moves also the security_timer cancellation behind this condition. Signed-off-by: Johan Hedberg Signed-off-by: Marcel Holtmann --- Reading git-diff-tree failed