]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Bluetooth: hci_bcm: Use non-sleep version of gpio_set_value
authorLoic Poulain <loic.poulain@intel.com>
Mon, 17 Aug 2015 14:00:21 +0000 (16:00 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Mon, 17 Aug 2015 22:59:19 +0000 (00:59 +0200)
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>
drivers/bluetooth/hci_bcm.c

index 322302b04710f1764fd339247f0ee32aed924743..33ec09752ea8143677a29668a5c4fd3e226fa1eb 100644 (file)
@@ -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);