Commit a0a5f3d3 authored Nov 14, 2019 by Oliver Neukum Committed by Greg Kroah-Hartman Jan 09, 2020

Bluetooth: btusb: fix PM leak in error case of setup



commit 3d44a6fd0775e6215e836423e27f8eedf8c871ea upstream.

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: ace31982 ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent b1ecf978

drivers/bluetooth/btusb.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1138,7 +1138,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;
		@@ -1170,6 +1170,7 @@ static int btusb_open(struct hci_dev *hdev)

		failed:
		clear_bit(BTUSB_INTR_RUNNING, &data->flags);
		setup_fail:
		usb_autopm_put_interface(data->intf);
		return err;
		}