]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
.37 patches
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 9 Mar 2011 23:28:10 +0000 (15:28 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 9 Mar 2011 23:28:10 +0000 (15:28 -0800)
queue-2.6.37/hid-hid-mosart-ignore-buttons-report.patch [new file with mode: 0644]
queue-2.6.37/nfsd-wrong-index-used-in-inner-loop.patch [new file with mode: 0644]
queue-2.6.37/pcc-cpufreq-don-t-load-driver-if-get_freq-fails-during-init.patch [new file with mode: 0644]
queue-2.6.37/series

diff --git a/queue-2.6.37/hid-hid-mosart-ignore-buttons-report.patch b/queue-2.6.37/hid-hid-mosart-ignore-buttons-report.patch
new file mode 100644 (file)
index 0000000..fb1849b
--- /dev/null
@@ -0,0 +1,45 @@
+From ad6d42670279da8f33f633f8a96a67cd7ef3b1da Mon Sep 17 00:00:00 2001
+From: Benjamin Tissoires <benjamin.tissoires@enac.fr>
+Date: Tue, 14 Dec 2010 11:38:18 +0100
+Subject: HID: hid-mosart: ignore buttons report
+
+From: Benjamin Tissoires <benjamin.tissoires@enac.fr>
+
+commit ad6d42670279da8f33f633f8a96a67cd7ef3b1da upstream.
+
+This commit allows the device to be recognized as a touchscreen, and not a
+touchpad by xf86-input-evdev.
+
+The device has 2 modes. The first one is an emulation of a touchscreen by
+sending left and right button, and the second mode is the one used in
+dual-touch (sending trackingID, touch and else).
+
+That's why there is a hid report containing left and right buttons
+(9000001 and 9000002). The point is that xorg relies on these fields to
+determine if it's a touchpad or a touchscreen.
+Clearing the report (return -1) makes xorg detecting it out of the box
+as a quite pleasant (dual)touchscreen.
+
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
+Acked-by: Chase Douglas <chase.douglas@canonical.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Cc: James Sharam <james.sharam@googlemail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/hid/hid-mosart.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/hid/hid-mosart.c
++++ b/drivers/hid/hid-mosart.c
+@@ -90,6 +90,10 @@ static int mosart_input_mapping(struct h
+       case 0xff000000:
+               /* ignore HID features */
+               return -1;
++
++      case HID_UP_BUTTON:
++              /* ignore buttons */
++              return -1;
+       }
+       return 0;
diff --git a/queue-2.6.37/nfsd-wrong-index-used-in-inner-loop.patch b/queue-2.6.37/nfsd-wrong-index-used-in-inner-loop.patch
new file mode 100644 (file)
index 0000000..dfff7c3
--- /dev/null
@@ -0,0 +1,39 @@
+From 3ec07aa9522e3d5e9d5ede7bef946756e623a0a0 Mon Sep 17 00:00:00 2001
+From: roel <roel.kluin@gmail.com>
+Date: Tue, 8 Mar 2011 22:32:26 +0100
+Subject: nfsd: wrong index used in inner loop
+
+From: roel <roel.kluin@gmail.com>
+
+commit 3ec07aa9522e3d5e9d5ede7bef946756e623a0a0 upstream.
+
+Index i was already used in the outer loop
+
+Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
+Signed-off-by: J. Bruce Fields <bfields@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ fs/nfsd/nfs4xdr.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/fs/nfsd/nfs4xdr.c
++++ b/fs/nfsd/nfs4xdr.c
+@@ -1107,7 +1107,7 @@ nfsd4_decode_create_session(struct nfsd4
+       u32 dummy;
+       char *machine_name;
+-      int i;
++      int i, j;
+       int nr_secflavs;
+       READ_BUF(16);
+@@ -1180,7 +1180,7 @@ nfsd4_decode_create_session(struct nfsd4
+                       READ_BUF(4);
+                       READ32(dummy);
+                       READ_BUF(dummy * 4);
+-                      for (i = 0; i < dummy; ++i)
++                      for (j = 0; j < dummy; ++j)
+                               READ32(dummy);
+                       break;
+               case RPC_AUTH_GSS:
diff --git a/queue-2.6.37/pcc-cpufreq-don-t-load-driver-if-get_freq-fails-during-init.patch b/queue-2.6.37/pcc-cpufreq-don-t-load-driver-if-get_freq-fails-during-init.patch
new file mode 100644 (file)
index 0000000..8ed9fef
--- /dev/null
@@ -0,0 +1,37 @@
+From 1f858ef2fbabdc5e645644010a31a40c32e397c9 Mon Sep 17 00:00:00 2001
+From: Naga Chumbalkar <nagananda.chumbalkar@hp.com>
+Date: Wed, 9 Mar 2011 14:02:49 +0000
+Subject: [CPUFREQ] pcc-cpufreq: don't load driver if get_freq fails during init.
+
+From: Naga Chumbalkar <nagananda.chumbalkar@hp.com>
+
+commit 1f858ef2fbabdc5e645644010a31a40c32e397c9 upstream.
+
+Return 0 on failure. This will cause the initialization of the driver
+to fail and prevent the driver from loading if the BIOS cannot handle
+the PCC interface command to "get frequency". Otherwise, the driver
+will load and display a very high value like "4294967274" (which is
+actually -EINVAL) for frequency:
+
+# cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_cur_freq
+4294967274
+
+Signed-off-by: Naga Chumbalkar <nagananda.chumbalkar@hp.com>
+Signed-off-by: Dave Jones <davej@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c
++++ b/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c
+@@ -195,7 +195,7 @@ static unsigned int pcc_get_freq(unsigne
+ cmd_incomplete:
+       iowrite16(0, &pcch_hdr->status);
+       spin_unlock(&pcc_lock);
+-      return -EINVAL;
++      return 0;
+ }
+ static int pcc_cpufreq_target(struct cpufreq_policy *policy,
index ffe245690ff1ac8f62a12b33a1f98559518b25af..ba54220f4fe634bf11121b998fa0d12c687f1bbb 100644 (file)
@@ -11,3 +11,6 @@ ath9k-fix-ath9k-prevents-cpu-to-enter-c3-states.patch
 ixgbe-fix-for-82599-erratum-on-header-splitting.patch
 mm-fix-possible-cause-of-a-page_mapped-bug.patch
 netfilter-nf_log-avoid-oops-in-un-bind-with-invalid-nfproto-values.patch
+pcc-cpufreq-don-t-load-driver-if-get_freq-fails-during-init.patch
+nfsd-wrong-index-used-in-inner-loop.patch
+hid-hid-mosart-ignore-buttons-report.patch