Skip to content

Commit b9af286

Browse files
committed
Bluetooth: rtk_btusb: static init running_flag_lock
rtk_btusb: RTKBT_RELEASE_NAME: 20200318_BT_ANDROID_9.0 rtk_btusb: Realtek Bluetooth USB driver module init, version 5.2.1 rtk_btusb: Register usb char device interface for BT driver BUG: spinlock bad magic on CPU#0, swapper/0/1 lock: running_flag_lock+0x0/0x38, .magic: 00000000, .owner: <none>/-1, .owner_cpu: 0 CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.4.194 #10 Hardware name: Rockchip RK3399 Evaluation Board v3 (Android) (DT) Call trace: [<ffffff800808a8c0>] dump_backtrace+0x0/0x1f4 [<ffffff800808aac8>] show_stack+0x14/0x1c [<ffffff8008416248>] dump_stack+0xb4/0xf4 [<ffffff800810b1c0>] spin_dump+0x70/0x8c [<ffffff800810b204>] spin_bug+0x28/0x34 [<ffffff800810b2a0>] do_raw_spin_lock+0x34/0x158 [<ffffff8008d68650>] _raw_spin_lock+0x48/0x54 [<ffffff80093b996c>] btusb_init+0x200/0x21c [<ffffff80080834a8>] do_one_initcall+0x84/0x1a8 [<ffffff8009380f10>] kernel_init_freeable+0x278/0x27c [<ffffff8008d61d3c>] kernel_init+0x10/0xf8 [<ffffff80080832d0>] ret_from_fork+0x10/0x40 Fixes: 4c267a4 ("Bluetooth: rtk_btusb: update rtk_btusb to version 5.2.1") Change-Id: I6ea6c46a5abccc5848ec6e1538c4d7109135b725 Signed-off-by: Tao Huang <huangtao@rock-chips.com>
1 parent 5374e9c commit b9af286

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/bluetooth/rtk_btusb.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
#define SET_WAKEUP_DEVICE 0
4747

4848

49-
static spinlock_t queue_lock;
50-
static spinlock_t running_flag_lock;
49+
static DEFINE_SPINLOCK(queue_lock);
50+
static DEFINE_SPINLOCK(running_flag_lock);
5151
static volatile uint16_t driver_state = 0;
5252

5353
#if SUSPNED_DW_FW
@@ -4479,8 +4479,6 @@ static int btusb_probe(struct usb_interface *intf, const struct usb_device_id *i
44794479
data->udev = udev;
44804480
data->intf = intf;
44814481

4482-
spin_lock_init(&queue_lock);
4483-
spin_lock_init(&running_flag_lock);
44844482
spin_lock_init(&data->lock);
44854483

44864484
INIT_WORK(&data->work, btusb_work);

0 commit comments

Comments
 (0)