[ rockchip default ] upstream patches
This commit is contained in:
parent
32e121bbff
commit
626fd3561c
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 4.4.176 Kernel Configuration
|
||||
# Linux/arm 4.4.181 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ARM_HAS_SG_CHAIN=y
|
||||
@ -62,6 +62,7 @@ CONFIG_HAVE_ARCH_AUDITSYSCALL=y
|
||||
CONFIG_GENERIC_IRQ_PROBE=y
|
||||
CONFIG_GENERIC_IRQ_SHOW=y
|
||||
CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
|
||||
CONFIG_GENERIC_IRQ_MIGRATION=y
|
||||
CONFIG_HARDIRQS_SW_RESEND=y
|
||||
CONFIG_GENERIC_IRQ_CHIP=y
|
||||
CONFIG_IRQ_DOMAIN=y
|
||||
@ -2185,6 +2186,7 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
|
||||
# CONFIG_SERIAL_NONSTANDARD is not set
|
||||
# CONFIG_N_GSM is not set
|
||||
# CONFIG_TRACE_SINK is not set
|
||||
CONFIG_LDISC_AUTOLOAD=y
|
||||
CONFIG_RK_CHAR_DRIVERS=y
|
||||
CONFIG_RK3288_DEVGPIOMEM=y
|
||||
CONFIG_DEVMEM=y
|
||||
@ -2238,7 +2240,6 @@ CONFIG_HW_RANDOM=y
|
||||
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
|
||||
CONFIG_HW_RANDOM_TPM=y
|
||||
CONFIG_HW_RANDOM_ROCKCHIP=m
|
||||
# CONFIG_R3964 is not set
|
||||
# CONFIG_RAW_DRIVER is not set
|
||||
CONFIG_TCG_TPM=y
|
||||
# CONFIG_TCG_TIS_I2C_ATMEL is not set
|
||||
|
||||
8231
patch/kernel/rockchip-default/04-patch-4.4.176-177.patch
Normal file
8231
patch/kernel/rockchip-default/04-patch-4.4.176-177.patch
Normal file
File diff suppressed because it is too large
Load Diff
1860
patch/kernel/rockchip-default/04-patch-4.4.177-178.patch
Normal file
1860
patch/kernel/rockchip-default/04-patch-4.4.177-178.patch
Normal file
File diff suppressed because it is too large
Load Diff
5220
patch/kernel/rockchip-default/04-patch-4.4.178-179.patch
Normal file
5220
patch/kernel/rockchip-default/04-patch-4.4.178-179.patch
Normal file
File diff suppressed because it is too large
Load Diff
5154
patch/kernel/rockchip-default/04-patch-4.4.179-180.patch
Normal file
5154
patch/kernel/rockchip-default/04-patch-4.4.179-180.patch
Normal file
File diff suppressed because it is too large
Load Diff
8285
patch/kernel/rockchip-default/04-patch-4.4.180-181.patch
Normal file
8285
patch/kernel/rockchip-default/04-patch-4.4.180-181.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,41 @@
|
||||
diff --git a/drivers/bluetooth/rtk_btusb.c b/drivers/bluetooth/rtk_btusb.c
|
||||
index 5db18841..ad74ec9e 100644
|
||||
--- a/drivers/bluetooth/rtk_btusb.c
|
||||
+++ b/drivers/bluetooth/rtk_btusb.c
|
||||
@@ -3064,9 +3064,6 @@ static int btusb_open(struct hci_dev *hdev)
|
||||
struct btusb_data *data = GET_DRV_DATA(hdev);
|
||||
int err = 0;
|
||||
|
||||
- RTKBT_INFO("%s: Start, PM usage count %d", __func__,
|
||||
- atomic_read(&(data->intf->pm_usage_cnt)));
|
||||
-
|
||||
err = usb_autopm_get_interface(data->intf);
|
||||
if (err < 0)
|
||||
return err;
|
||||
@@ -3095,16 +3092,12 @@ static int btusb_open(struct hci_dev *hdev)
|
||||
|
||||
done:
|
||||
usb_autopm_put_interface(data->intf);
|
||||
- RTKBT_INFO("%s: End, PM usage count %d", __func__,
|
||||
- atomic_read(&(data->intf->pm_usage_cnt)));
|
||||
return 0;
|
||||
|
||||
failed:
|
||||
clear_bit(BTUSB_INTR_RUNNING, &data->flags);
|
||||
clear_bit(HCI_RUNNING, &hdev->flags);
|
||||
usb_autopm_put_interface(data->intf);
|
||||
- RTKBT_ERR("%s: Failed, PM usage count %d", __func__,
|
||||
- atomic_read(&(data->intf->pm_usage_cnt)));
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -3610,9 +3603,6 @@ static void btusb_waker(struct work_struct *work)
|
||||
struct btusb_data *data = container_of(work, struct btusb_data, waker);
|
||||
int err;
|
||||
|
||||
- RTKBT_DBG("%s: PM usage count %d", __func__,
|
||||
- atomic_read(&data->intf->pm_usage_cnt));
|
||||
-
|
||||
err = usb_autopm_get_interface(data->intf);
|
||||
if (err < 0)
|
||||
return;
|
||||
Loading…
Reference in New Issue
Block a user