summaryrefslogtreecommitdiff
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorHayden Du <haydend@nvidia.com>2012-08-10 10:04:20 +0800
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 12:31:33 -0700
commit8da74b05b92bb4523a84dab54b75ae0e4567f5f9 (patch)
tree74ddf534e160e9741dfac8d935ef96155186df2d /drivers/bluetooth
parent314ddba68c08ef4206020a3586db2cecdae126c7 (diff)
bluesleep: remove WARNING message during kernel statup.
in bluesleep's probe function, will generate a WARNING message if bluesleep don't have a bt_ext_wake resource, because in probe function some call path will free bt_ext_wake gpio even that gpio not request, we can add a jugement to see wether the gpio has request before we free it. Change-Id: Idb6fb10da8b21cf51d75f6421061aca0471cde54 Signed-off-by: Hayden Du <haydend@nvidia.com> Reviewed-on: http://git-master/r/122568 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Rakesh Goyal <rgoyal@nvidia.com> Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Rebase-Id: Rc26b598e716762383cf275ce936fedaabb31440b
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/bluesleep.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/bluetooth/bluesleep.c b/drivers/bluetooth/bluesleep.c
index 1089451e5f4b..7a05bb84a8e4 100644
--- a/drivers/bluetooth/bluesleep.c
+++ b/drivers/bluetooth/bluesleep.c
@@ -679,7 +679,8 @@ static int bluesleep_probe(struct platform_device *pdev)
free_wake_lock:
wake_lock_destroy(&bsi->wake_lock);
free_bt_ext_wake:
- gpio_free(bsi->ext_wake);
+ if (bsi->has_ext_wake)
+ gpio_free(bsi->ext_wake);
free_bt_host_wake:
gpio_free(bsi->host_wake);
free_bsi:
@@ -691,7 +692,8 @@ static int bluesleep_remove(struct platform_device *pdev)
{
free_irq(bsi->host_wake_irq, NULL);
gpio_free(bsi->host_wake);
- gpio_free(bsi->ext_wake);
+ if (bsi->has_ext_wake)
+ gpio_free(bsi->ext_wake);
wake_lock_destroy(&bsi->wake_lock);
kfree(bsi);
return 0;