summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorLoic Poulain <loic.poulain@intel.com>2015-08-17 16:00:21 +0200
committerMarcel Holtmann <marcel@holtmann.org>2015-08-18 00:59:19 +0200
commit2af0a709134f842b67151d6b97d512184fcc4ad6 (patch)
tree023d2db1e4c9ea190489d92ba20ae005fea25af8 /drivers/bluetooth
parent9cd3778cd7e8f165675705511cfcd4ea6eb88d27 (diff)
downloadlinux-2af0a709134f842b67151d6b97d512184fcc4ad6.tar.gz
linux-2af0a709134f842b67151d6b97d512184fcc4ad6.tar.bz2
linux-2af0a709134f842b67151d6b97d512184fcc4ad6.zip
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>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/hci_bcm.c4
1 files changed, 2 insertions, 2 deletions
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);