Bluetooth: hci_bcm: Fix unbalanced pm_runtime_disable()
authorLukas Wunner <lukas@wunner.de>
Wed, 10 Jan 2018 15:32:10 +0000 (16:32 +0100)
committerMarek Szyprowski <m.szyprowski@samsung.com>
Fri, 14 Dec 2018 10:04:15 +0000 (11:04 +0100)
On ->setup, pm_runtime_enable() is only called if a valid IRQ was found,
but on ->close(), pm_runtime_disable() is called unconditionally.
Disablement of runtime PM is recorded in a counter, so every
pm_runtime_disable() needs to be balanced.  Fix it.

Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Reported-and-reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
drivers/bluetooth/hci_bcm.c

index 13ea5b719e64d0fbbea5f2881e7b40dd4695bc7b..b949cde2a6781527004d0fb45492472a42216c52 100644 (file)
@@ -373,10 +373,10 @@ static int bcm_close(struct hci_uart *hu)
                if (IS_ENABLED(CONFIG_PM) && bdev->irq > 0) {
                        devm_free_irq(bdev->dev, bdev->irq, bdev);
                        device_init_wakeup(bdev->dev, false);
+                       pm_runtime_disable(bdev->dev);
                }
 
                bcm_gpio_set_power(bdev, false);
-               pm_runtime_disable(bdev->dev);
                pm_runtime_set_suspended(bdev->dev);
        }
        mutex_unlock(&bcm_device_lock);