Re: 2.6.8-rc2-mm1

Adam Kropelin
2004-07-28T22:13:54Z

On Wed, Jul 28, 2004 at 02:04:44AM -0700, Andrew Morton wrote:
>
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.8-rc2/2.6.8-rc2-mm1/

<snip>

> - If people have patches in here which are important for a 2.6.8 release,
> please let me know.

There's a trivial yet fairly important fix to hiddev.h in bk-input that
it would be nice to get merged before 2.6.8. Distros have been
shipping the current in-tree (broken) version with their kernel headers
packages so a number of userspace apps cannot build. I've broken out the
patch below.

There's also a hiddev oops-on-removal fix that ought to be merged fairly
soon, but I can understand if Vojtech wants that tested a bit longer
first.

--Adam

diff -Nru a/include/linux/hiddev.h b/include/linux/hiddev.h
--- a/include/linux/hiddev.h 2004-07-27 18:37:32 -07:00
+++ b/include/linux/hiddev.h 2004-07-27 18:37:32 -07:00
@@ -128,10 +128,11 @@

/* hiddev_usage_ref_multi is used for sending multiple bytes to a control.
* It really manifests itself as setting the value of consecutive usages */
+#define HID_MAX_MULTI_USAGES 1024
struct hiddev_usage_ref_multi {
struct hiddev_usage_ref uref;
__u32 num_values;
- __s32 values[HID_MAX_USAGES];
+ __s32 values[HID_MAX_MULTI_USAGES];
};

/* FIELD_INDEX_NONE is returned in read() data from the kernel when flags
@@ -211,6 +212,11 @@
/*
* In-kernel definitions.
*/
+
+struct hid_device;
+struct hid_usage;
+struct hid_field;
+struct hid_report;

#ifdef CONFIG_USB_HIDDEV
int hiddev_connect(struct hid_device *);