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:22:52 -0400 |
| commit | 60007af702b726bced8095649b80e4bf1c938200 (patch) | |
| tree | 4fdb60622f0e1f6ec456ca3f3070ce21fc8a719c | |
| parent | 22aa2b2ba7c8a203f8a3983af96bb840c956bdb3 (diff) | |
| download | kernel-60007af702b726bced8095649b80e4bf1c938200.tar.gz kernel-60007af702b726bced8095649b80e4bf1c938200.tar.xz kernel-60007af702b726bced8095649b80e4bf1c938200.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 | 7 |
2 files changed, 4 insertions, 33 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 0c79b6a5..00000000 --- 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 5197c9eb..bf12965d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 300 +%global baserelease 301 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -781,7 +781,6 @@ Patch25071: drm-i915-correctly-restore-fences-with-objects-attac.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 @@ -1512,7 +1511,6 @@ ApplyPatch drm-i915-correctly-restore-fences-with-objects-attac.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 @@ -2322,6 +2320,9 @@ fi # and build. %changelog +* Thu Aug 01 2013 Josh Boyer <jwboyer@redhat.com> +- Drop hid-logitech-dj patch that was breaking enumeration (rhbz 989138) + * Wed Jul 31 2013 Josh Boyer <jwboyer@redhat.com> - update s390x config [Dan Horák] |