diff options
author | Greg KH <greg@press.(none)> | 2005-10-14 16:48:04 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-14 16:48:04 -0700 |
commit | 97f0358110694370d21c8e927c1106908361ddc2 (patch) | |
tree | 61154ed1dd1f459fbcfc95e800b64efbe597867c /driver | |
parent | 0126619a8ca46807183eab074d41c3a5191de075 (diff) | |
download | patches-97f0358110694370d21c8e927c1106908361ddc2.tar.gz |
new patches
Diffstat (limited to 'driver')
-rw-r--r-- | driver/driver-core-big-kfree-null-check-cleanup-documentation.patch | 136 |
1 files changed, 136 insertions, 0 deletions
diff --git a/driver/driver-core-big-kfree-null-check-cleanup-documentation.patch b/driver/driver-core-big-kfree-null-check-cleanup-documentation.patch new file mode 100644 index 0000000000000..7a1eec792c86e --- /dev/null +++ b/driver/driver-core-big-kfree-null-check-cleanup-documentation.patch @@ -0,0 +1,136 @@ +From jesper.juhl@gmail.com Thu Oct 13 13:21:11 2005 +From: Jesper Juhl <jesper.juhl@gmail.com> +Subject: Driver Core: Big kfree NULL check cleanup - Documentation +Date: Thu, 13 Oct 2005 21:31:08 +0200 +Cc: Andrew Morton <akpm@osdl.org>, "Greg Kroah-Hartman" <gregkh@suse.de>, Jesper Juhl <jesper.juhl@gmail.com> +Content-Disposition: inline +Message-Id: <200510132131.09134.jesper.juhl@gmail.com> + +This is the Documentation/ part of the big kfree cleanup patch. + +Remove pointless checks for NULL prior to calling kfree() in example code in Documentation/. + + +Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +--- + Documentation/DocBook/writing_usb_driver.tmpl | 3 +-- + Documentation/input/yealink.txt | 25 +++++++++++++++++++------ + MAINTAINERS | 12 ++++++------ + drivers/usb/input/map_to_7segment.h | 2 +- + 4 files changed, 27 insertions(+), 15 deletions(-) + +--- gregkh-2.6.orig/Documentation/DocBook/writing_usb_driver.tmpl ++++ gregkh-2.6/Documentation/DocBook/writing_usb_driver.tmpl +@@ -345,8 +345,7 @@ if (!retval) { + <programlisting> + static inline void skel_delete (struct usb_skel *dev) + { +- if (dev->bulk_in_buffer != NULL) +- kfree (dev->bulk_in_buffer); ++ kfree (dev->bulk_in_buffer); + if (dev->bulk_out_buffer != NULL) + usb_buffer_free (dev->udev, dev->bulk_out_size, + dev->bulk_out_buffer, +--- gregkh-2.6.orig/Documentation/input/yealink.txt ++++ gregkh-2.6/Documentation/input/yealink.txt +@@ -2,7 +2,6 @@ Driver documentation for yealink usb-p1k + + 0. Status + ~~~~~~~~~ +- + The p1k is a relatively cheap usb 1.1 phone with: + - keyboard full support, yealink.ko / input event API + - LCD full support, yealink.ko / sysfs API +@@ -17,17 +16,31 @@ For vendor documentation see http://www. + + 1. Compilation (stand alone version) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +- + Currently only kernel 2.6.x.y versions are supported. +-In order to build the yealink.ko module do: ++In order to build the yealink.ko module do + + make + +-If you encounter problems please check if in the MAKE_OPTS variable in ++If you encounter problems please check if in the MAKE_OPTS variable in + the Makefile is pointing to the location where your kernel sources + are located, default /usr/src/linux. + + ++1.1 Troubleshooting ++~~~~~~~~~~~~~~~~~~~ ++Q: Module yealink compiled and installed without any problem but phone ++ is not initialized and does not react to any actions. ++A: If you see something like: ++ hiddev0: USB HID v1.00 Device [Yealink Network Technology Ltd. VOIP USB Phone ++ in dmesg, it means that the hid driver has grabbed the device first. Try to ++ load module yealink before any other usb hid driver. Please see the ++ instructions provided by your distribution on module configuration. ++ ++Q: Phone is working now (displays version and accepts keypad input) but I can't ++ find the sysfs files. ++A: The sysfs files are located on the particular usb endpoint. On most ++ distributions you can do: "find /sys/ -name get_icons" for a hint. ++ + + 2. keyboard features + ~~~~~~~~~~~~~~~~~~~~ +@@ -134,7 +147,7 @@ Writing to /sys/../lineX will set the co + Will update the LCD with the current date & time. + + +-4.2 get_icons ++4.2 get_icons + ~~~~~~~~~~~~~ + Reading will return all available icon names and its current settings: + +@@ -159,7 +172,7 @@ Reading will return all available icon n + RINGTONE + + +-4.3 show/hide icons ++4.3 show/hide icons + ~~~~~~~~~~~~~~~~~~~ + Writing to these files will update the state of the icon. + Only one icon at a time can be updated. +--- gregkh-2.6.orig/MAINTAINERS ++++ gregkh-2.6/MAINTAINERS +@@ -116,12 +116,6 @@ M: ajk@iehk.rwth-aachen.de + L: linux-hams@vger.kernel.org + S: Maintained + +-YEALINK PHONE DRIVER +-P: Henk Vergonet +-M: Henk.Vergonet@gmail.com +-L: usbb2k-api-dev@nongnu.org +-S: Maintained +- + 8139CP 10/100 FAST ETHERNET DRIVER + P: Jeff Garzik + M: jgarzik@pobox.com +@@ -2854,6 +2848,12 @@ M: jpr@f6fbb.org + L: linux-hams@vger.kernel.org + S: Maintained + ++YEALINK PHONE DRIVER ++P: Henk Vergonet ++M: Henk.Vergonet@gmail.com ++L: usbb2k-api-dev@nongnu.org ++S: Maintained ++ + YMFPCI YAMAHA PCI SOUND (Use ALSA instead) + P: Pete Zaitcev + M: zaitcev@yahoo.com +--- gregkh-2.6.orig/drivers/usb/input/map_to_7segment.h ++++ gregkh-2.6/drivers/usb/input/map_to_7segment.h +@@ -79,7 +79,7 @@ struct seg7_conversion_map { + + static inline int map_to_seg7(struct seg7_conversion_map *map, int c) + { +- return c & 0x7f ? map->table[c] : -EINVAL; ++ return c >= 0 && c < sizeof(map->table) ? map->table[c] : -EINVAL; + } + + #define SEG7_CONVERSION_MAP(_name, _map) \ |