diff options
| author |   Oliver Neukum <oneukum@suse.com> | 2019-11-14 16:01:18 +0100 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2019-11-15 09:06:38 +0100 |
| commit | 3d44a6fd0775e6215e836423e27f8eedf8c871ea (patch) | |
| tree | a41268f62af815b561cbc0708849cddb2e1aff81 /drivers/bluetooth | |
| parent | Merge branch 'ARM-Enable-GENET-support-for-RPi-4' (diff) | |
| download | linux-dev-3d44a6fd0775e6215e836423e27f8eedf8c871ea.tar.xz linux-dev-3d44a6fd0775e6215e836423e27f8eedf8c871ea.zip | |
Bluetooth: btusb: fix PM leak in error case of setup
If setup() fails a reference for runtime PM has already
been taken. Proper use of the error handling in btusb_open()is needed.
You cannot just return.
Fixes: ace31982585a3 ("Bluetooth: btusb: Add setup callback for chip init on USB")
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 04a139e7793f..70e385987d41 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -1200,7 +1200,7 @@ static int btusb_open(struct hci_dev *hdev) if (data->setup_on_usb) { err = data->setup_on_usb(hdev); if (err < 0) - return err; + goto setup_fail; } data->intf->needs_remote_wakeup = 1; @@ -1239,6 +1239,7 @@ done: failed: clear_bit(BTUSB_INTR_RUNNING, &data->flags); +setup_fail: usb_autopm_put_interface(data->intf); return err; } |