diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2013-08-01 08:22:52 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2013-08-01 08:44:46 -0400 |
| commit | 8330880f50134651478a7b02d27219b365524fae (patch) | |
| tree | 0312c5f1cfb30588cc97b2406ef69296e57b00b0 | |
| parent | f7eb1e52066957eb9d9c210738f9f203461ef878 (diff) | |
| download | kernel-8330880f50134651478a7b02d27219b365524fae.tar.gz kernel-8330880f50134651478a7b02d27219b365524fae.tar.xz kernel-8330880f50134651478a7b02d27219b365524fae.zip | |
Drop hid-logitech-dj patch that was breaking enumeration (rhbz 989138)
| -rw-r--r-- | HID-hid-logitech-dj-querying_devices-was-never-set.patch | 30 | ||||
| -rw-r--r-- | kernel.spec | 5 |
2 files changed, 3 insertions, 32 deletions
diff --git a/HID-hid-logitech-dj-querying_devices-was-never-set.patch b/HID-hid-logitech-dj-querying_devices-was-never-set.patch deleted file mode 100644 index 0c79b6a5b..000000000 --- a/HID-hid-logitech-dj-querying_devices-was-never-set.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 407a2c2a4d85100c8c67953e4bac2f4a6c942335 Mon Sep 17 00:00:00 2001 -From: Nestor Lopez Casado <nlopezcasad@logitech.com> -Date: Thu, 18 Jul 2013 13:21:31 +0000 -Subject: HID: hid-logitech-dj: querying_devices was never set - -Set querying_devices flag to true when we start the enumeration -process. - -This was missing from the original patch. It never produced -undesirable effects as it is highly improbable to have a second -enumeration triggered while a first one was still in progress. - -Signed-off-by: Nestor Lopez Casado <nlopezcasad@logitech.com> -Signed-off-by: Jiri Kosina <jkosina@suse.cz> ---- -diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c -index cd33084..7a57648 100644 ---- a/drivers/hid/hid-logitech-dj.c -+++ b/drivers/hid/hid-logitech-dj.c -@@ -488,6 +488,8 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev) - if (djrcv_dev->querying_devices) - return 0; - -+ djrcv_dev->querying_devices = true; -+ - dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL); - if (!dj_report) - return -ENOMEM; --- -cgit v0.9.2 diff --git a/kernel.spec b/kernel.spec index e48f53846..48d843f2e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -753,7 +753,6 @@ Patch25069: iwlwifi-dvm-fix-calling-ieee80211_chswitch_done-with-NULL.patch #rhbz 989138 Patch25072: HID-Revert-Revert-HID-Fix-logitech-dj-missing-Unifying-device-issue.patch -Patch25073: HID-hid-logitech-dj-querying_devices-was-never-set.patch # END OF PATCH DEFINITIONS @@ -1460,7 +1459,6 @@ ApplyPatch iwlwifi-dvm-fix-calling-ieee80211_chswitch_done-with-NULL.patch #rhbz 989138 ApplyPatch HID-Revert-Revert-HID-Fix-logitech-dj-missing-Unifying-device-issue.patch -ApplyPatch HID-hid-logitech-dj-querying_devices-was-never-set.patch # END OF PATCH APPLICATIONS @@ -2258,6 +2256,9 @@ fi # ||----w | # || || %changelog +* Thu Aug 01 2013 Josh Boyer <jwboyer@redhat.com> +- Drop hid-logitech-dj patch that was breaking enumeration (rhbz 989138) + * Tue Jul 30 2013 Josh Boyer <jwboyer@redhat.com> - 3.11.0-0.rc3.git1.1 - Linux v3.11-rc3-4-g36f571e - Reenable debugging options. |