From: Greg Kroah-Hartman Date: Fri, 28 Sep 2012 22:26:50 +0000 (-0700) Subject: delete queue-3.0/bluetooth-fix-not-removing-power_off-delayed-work.patch X-Git-Tag: v3.0.44~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0173ba5ae9e33c8847fd30f201faea2fc23d82a4;p=thirdparty%2Fkernel%2Fstable-queue.git delete queue-3.0/bluetooth-fix-not-removing-power_off-delayed-work.patch --- diff --git a/queue-3.0/bluetooth-fix-not-removing-power_off-delayed-work.patch b/queue-3.0/bluetooth-fix-not-removing-power_off-delayed-work.patch deleted file mode 100644 index ef6b01ce74d..00000000000 --- a/queue-3.0/bluetooth-fix-not-removing-power_off-delayed-work.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 78c04c0bf52360dc2f7185e99c8e9aa05d73ae5a Mon Sep 17 00:00:00 2001 -From: Vinicius Costa Gomes -Date: Fri, 14 Sep 2012 16:34:46 -0300 -Subject: Bluetooth: Fix not removing power_off delayed work - -From: Vinicius Costa Gomes - -commit 78c04c0bf52360dc2f7185e99c8e9aa05d73ae5a upstream. - -For example, when a usb reset is received (I could reproduce it -running something very similar to this[1] in a loop) it could be -that the device is unregistered while the power_off delayed work -is still scheduled to run. - -Backtrace: - -WARNING: at lib/debugobjects.c:261 debug_print_object+0x7c/0x8d() -Hardware name: To Be Filled By O.E.M. -ODEBUG: free active (active state 0) object type: timer_list hint: delayed_work_timer_fn+0x0/0x26 -Modules linked in: nouveau mxm_wmi btusb wmi bluetooth ttm coretemp drm_kms_helper -Pid: 2114, comm: usb-reset Not tainted 3.5.0bt-next #2 -Call Trace: - [] ? free_obj_work+0x57/0x91 - [] warn_slowpath_common+0x7e/0x97 - [] warn_slowpath_fmt+0x41/0x43 - [] debug_print_object+0x7c/0x8d - [] ? __queue_work+0x259/0x259 - [] ? debug_check_no_obj_freed+0x6f/0x1b5 - [] debug_check_no_obj_freed+0x98/0x1b5 - [] ? bt_host_release+0x10/0x1e [bluetooth] - [] kfree+0x90/0xe6 - [] bt_host_release+0x10/0x1e [bluetooth] - [] device_release+0x4a/0x7e - [] kobject_release+0x11d/0x154 - [] kobject_put+0x4a/0x4f - [] put_device+0x12/0x14 - [] hci_free_dev+0x22/0x26 [bluetooth] - [] btusb_disconnect+0x96/0x9f [btusb] - [] usb_unbind_interface+0x57/0x106 - [] __device_release_driver+0x83/0xd6 - [] device_release_driver+0x20/0x2d - [] usb_driver_release_interface+0x44/0x7b - [] usb_forced_unbind_intf+0x45/0x4e - [] usb_reset_device+0xa6/0x12e - [] usbdev_do_ioctl+0x319/0xe20 - [] ? avc_has_perm_flags+0xc9/0x12e - [] ? avc_has_perm_flags+0x25/0x12e - [] ? do_page_fault+0x31e/0x3a1 - [] usbdev_ioctl+0x9/0xd - [] vfs_ioctl+0x21/0x34 - [] do_vfs_ioctl+0x408/0x44b - [] ? file_has_perm+0x76/0x81 - [] sys_ioctl+0x51/0x76 - [] system_call_fastpath+0x16/0x1b - -[1] http://cpansearch.perl.org/src/DPAVLIN/Biblio-RFID-0.03/examples/usbreset.c - -Signed-off-by: Vinicius Costa Gomes -Signed-off-by: Gustavo Padovan -Signed-off-by: Greg Kroah-Hartman - ---- - net/bluetooth/hci_core.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/net/bluetooth/hci_core.c -+++ b/net/bluetooth/hci_core.c -@@ -588,6 +588,8 @@ static int hci_dev_do_close(struct hci_d - { - BT_DBG("%s %p", hdev->name, hdev); - -+ cancel_delayed_work(&hdev->power_off); -+ - hci_req_cancel(hdev, ENODEV); - hci_req_lock(hdev); - diff --git a/queue-3.0/series b/queue-3.0/series index 0447f0e06bf..58e98ec8e32 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -53,7 +53,6 @@ hwmon-ads7871-add-name-sysfs-attribute.patch scsi-mpt2sas-fix-for-issue-unable-to-boot-from-the-drive-connected-to-hba.patch scsi-bnx2i-fixed-null-ptr-deference-for-1g-bnx2-linux-iscsi-offload.patch scsi-hpsa-fix-handling-of-protocol-error.patch -bluetooth-fix-not-removing-power_off-delayed-work.patch hpwdt-fix-kdump-issue-in-hpwdt.patch arm-fix-bad-applied-patch-for-arch-arm-kconfig-of-stable-3.0.y-tree.patch arm-7532-1-decompressor-reset-sctlr.tre-for-vmsa-armv7-cores.patch