From: Loic Poulain <loic.poulain@intel.com>
Date: Mon, 17 Aug 2015 14:00:21 +0000 (+0200)
Subject: Bluetooth: hci_bcm: Use non-sleep version of gpio_set_value
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2af0a709134f842b67151d6b97d512184fcc4ad6;p=deliverable%2Flinux.git

Bluetooth: hci_bcm: Use non-sleep version of gpio_set_value

We should not sleep while holding a spinlock.
bcm_gpio_set_power is called while holding the bcm_device_list lock.

Signed-off-by: Loic Poulain <loic.poulain@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---

diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index 322302b04710..33ec09752ea8 100644
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -138,8 +138,8 @@ static int bcm_gpio_set_power(struct bcm_device *dev, bool powered)
 	if (powered && !IS_ERR(dev->clk) && !dev->clk_enabled)
 		clk_enable(dev->clk);
 
-	gpiod_set_value_cansleep(dev->shutdown, powered);
-	gpiod_set_value_cansleep(dev->device_wakeup, powered);
+	gpiod_set_value(dev->shutdown, powered);
+	gpiod_set_value(dev->device_wakeup, powered);
 
 	if (!powered && !IS_ERR(dev->clk) && dev->clk_enabled)
 		clk_disable(dev->clk);