summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@nvidia.com>2011-03-24 22:29:07 -0700
committerVarun Colbert <vcolbert@nvidia.com>2011-03-28 23:50:15 -0700
commit2caadbd54f99354d530168da0fd02f9906a0dd41 (patch)
tree3b4a6b5dd6e1311c1ffba72d1f67c0f4688c6e39
parentbc77c5269f8c9616cc84be57245d3a993e65bc94 (diff)
bluetooth: bluesleep: Exit early if device not registered
If the device isn't registered for this board, return out of the init function early. Change-Id: Ic806b4be1671a77a8fedc1c0376362bc177b0604 Reviewed-on: http://git-master/r/24254 Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com> Tested-by: Daniel Willemsen <dwillemsen@nvidia.com> Reviewed-by: Anantha Idapalapati <aidapalapati@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
-rw-r--r--drivers/bluetooth/bluesleep.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/bluetooth/bluesleep.c b/drivers/bluetooth/bluesleep.c
index c72bb51105c5..027730972732 100644
--- a/drivers/bluetooth/bluesleep.c
+++ b/drivers/bluetooth/bluesleep.c
@@ -706,6 +706,9 @@ static int __init bluesleep_init(void)
if (retval)
return retval;
+ if (bsi == NULL)
+ return 0;
+
bluesleep_hdev = NULL;
bluetooth_dir = proc_mkdir("bluetooth", NULL);
@@ -792,6 +795,9 @@ fail:
*/
static void __exit bluesleep_exit(void)
{
+ if (bsi == NULL)
+ return;
+
/* assert bt wake */
if (bsi->has_ext_wake == 1)
gpio_set_value(bsi->ext_wake, 1);